diff --git a/src/AST/Stmt.cs b/src/AST/Stmt.cs
index 926fd670e8..f9dcf9a25f 100644
--- a/src/AST/Stmt.cs
+++ b/src/AST/Stmt.cs
@@ -10,143 +10,145 @@
 
 namespace CppSharp.AST
 {
-    public enum StmtClass
-    {
-        NoStmt = 0,
-        GCCAsmStmt = 1,
-        MSAsmStmt = 2,
-        AttributedStmt = 3,
-        BreakStmt = 4,
-        CXXCatchStmt = 5,
-        CXXForRangeStmt = 6,
-        CXXTryStmt = 7,
-        CapturedStmt = 8,
-        CompoundStmt = 9,
-        ContinueStmt = 10,
-        CoreturnStmt = 11,
-        CoroutineBodyStmt = 12,
-        DeclStmt = 13,
-        DoStmt = 14,
-        BinaryConditionalOperator = 15,
-        ConditionalOperator = 16,
-        AddrLabelExpr = 17,
-        ArrayInitIndexExpr = 18,
-        ArrayInitLoopExpr = 19,
-        ArraySubscriptExpr = 20,
-        ArrayTypeTraitExpr = 21,
-        AsTypeExpr = 22,
-        AtomicExpr = 23,
-        BinaryOperator = 24,
-        CompoundAssignOperator = 25,
-        BlockExpr = 26,
-        CXXBindTemporaryExpr = 27,
-        CXXBoolLiteralExpr = 28,
-        CXXConstructExpr = 29,
-        CXXTemporaryObjectExpr = 30,
-        CXXDefaultArgExpr = 31,
-        CXXDefaultInitExpr = 32,
-        CXXDeleteExpr = 33,
-        CXXDependentScopeMemberExpr = 34,
-        CXXFoldExpr = 35,
-        CXXInheritedCtorInitExpr = 36,
-        CXXNewExpr = 37,
-        CXXNoexceptExpr = 38,
-        CXXNullPtrLiteralExpr = 39,
-        CXXPseudoDestructorExpr = 40,
-        CXXScalarValueInitExpr = 41,
-        CXXStdInitializerListExpr = 42,
-        CXXThisExpr = 43,
-        CXXThrowExpr = 44,
-        CXXTypeidExpr = 45,
-        CXXUnresolvedConstructExpr = 46,
-        CXXUuidofExpr = 47,
-        CallExpr = 48,
-        CUDAKernelCallExpr = 49,
-        CXXMemberCallExpr = 50,
-        CXXOperatorCallExpr = 51,
-        UserDefinedLiteral = 52,
-        CStyleCastExpr = 53,
-        CXXFunctionalCastExpr = 54,
-        CXXConstCastExpr = 55,
-        CXXDynamicCastExpr = 56,
-        CXXReinterpretCastExpr = 57,
-        CXXStaticCastExpr = 58,
-        ImplicitCastExpr = 60,
-        CharacterLiteral = 61,
-        ChooseExpr = 62,
-        CompoundLiteralExpr = 63,
-        ConvertVectorExpr = 64,
-        CoawaitExpr = 65,
-        CoyieldExpr = 66,
-        DeclRefExpr = 67,
-        DependentCoawaitExpr = 68,
-        DependentScopeDeclRefExpr = 69,
-        DesignatedInitExpr = 70,
-        DesignatedInitUpdateExpr = 71,
-        ExpressionTraitExpr = 72,
-        ExtVectorElementExpr = 73,
-        FixedPointLiteral = 74,
-        FloatingLiteral = 75,
-        ConstantExpr = 76,
-        ExprWithCleanups = 77,
-        FunctionParmPackExpr = 78,
-        GNUNullExpr = 79,
-        GenericSelectionExpr = 80,
-        ImaginaryLiteral = 81,
-        ImplicitValueInitExpr = 82,
-        InitListExpr = 83,
-        IntegerLiteral = 84,
-        LambdaExpr = 85,
-        MSPropertyRefExpr = 86,
-        MSPropertySubscriptExpr = 87,
-        MaterializeTemporaryExpr = 88,
-        MemberExpr = 89,
-        NoInitExpr = 90,
-        OffsetOfExpr = 107,
-        OpaqueValueExpr = 108,
-        UnresolvedLookupExpr = 109,
-        UnresolvedMemberExpr = 110,
-        PackExpansionExpr = 111,
-        ParenExpr = 112,
-        ParenListExpr = 113,
-        PredefinedExpr = 114,
-        PseudoObjectExpr = 115,
-        ShuffleVectorExpr = 116,
-        SizeOfPackExpr = 117,
-        StmtExpr = 118,
-        StringLiteral = 119,
-        SubstNonTypeTemplateParmExpr = 120,
-        SubstNonTypeTemplateParmPackExpr = 121,
-        TypeTraitExpr = 122,
-        TypoExpr = 123,
-        UnaryExprOrTypeTraitExpr = 124,
-        UnaryOperator = 125,
-        VAArgExpr = 126,
-        ForStmt = 127,
-        GotoStmt = 128,
-        IfStmt = 129,
-        IndirectGotoStmt = 130,
-        LabelStmt = 131,
-        MSDependentExistsStmt = 132,
-        NullStmt = 133,
-        ReturnStmt = 188,
-        SEHExceptStmt = 189,
-        SEHFinallyStmt = 190,
-        SEHLeaveStmt = 191,
-        SEHTryStmt = 192,
-        CaseStmt = 193,
-        DefaultStmt = 194,
-        SwitchStmt = 195,
-        WhileStmt = 196,
-    }
-
     public partial class Stmt
     {
+        public enum StmtClass
+        {
+            NoStmt = 0,
+            GCCAsmStmt = 1,
+            MSAsmStmt = 2,
+            AttributedStmt = 3,
+            BreakStmt = 4,
+            CXXCatchStmt = 5,
+            CXXForRangeStmt = 6,
+            CXXTryStmt = 7,
+            CapturedStmt = 8,
+            CompoundStmt = 9,
+            ContinueStmt = 10,
+            CoreturnStmt = 11,
+            CoroutineBodyStmt = 12,
+            DeclStmt = 13,
+            DoStmt = 14,
+            BinaryConditionalOperator = 15,
+            ConditionalOperator = 16,
+            AddrLabelExpr = 17,
+            ArrayInitIndexExpr = 18,
+            ArrayInitLoopExpr = 19,
+            ArraySubscriptExpr = 20,
+            ArrayTypeTraitExpr = 21,
+            AsTypeExpr = 22,
+            AtomicExpr = 23,
+            BinaryOperator = 24,
+            CompoundAssignOperator = 25,
+            BlockExpr = 26,
+            CXXBindTemporaryExpr = 27,
+            CXXBoolLiteralExpr = 28,
+            CXXConstructExpr = 29,
+            CXXTemporaryObjectExpr = 30,
+            CXXDefaultArgExpr = 31,
+            CXXDefaultInitExpr = 32,
+            CXXDeleteExpr = 33,
+            CXXDependentScopeMemberExpr = 34,
+            CXXFoldExpr = 35,
+            CXXInheritedCtorInitExpr = 36,
+            CXXNewExpr = 37,
+            CXXNoexceptExpr = 38,
+            CXXNullPtrLiteralExpr = 39,
+            CXXPseudoDestructorExpr = 40,
+            CXXScalarValueInitExpr = 41,
+            CXXStdInitializerListExpr = 42,
+            CXXThisExpr = 43,
+            CXXThrowExpr = 44,
+            CXXTypeidExpr = 45,
+            CXXUnresolvedConstructExpr = 46,
+            CXXUuidofExpr = 47,
+            CallExpr = 48,
+            CUDAKernelCallExpr = 49,
+            CXXMemberCallExpr = 50,
+            CXXOperatorCallExpr = 51,
+            UserDefinedLiteral = 52,
+            CStyleCastExpr = 53,
+            CXXFunctionalCastExpr = 54,
+            CXXConstCastExpr = 55,
+            CXXDynamicCastExpr = 56,
+            CXXReinterpretCastExpr = 57,
+            CXXStaticCastExpr = 58,
+            ImplicitCastExpr = 60,
+            CharacterLiteral = 61,
+            ChooseExpr = 62,
+            CompoundLiteralExpr = 63,
+            ConvertVectorExpr = 64,
+            CoawaitExpr = 65,
+            CoyieldExpr = 66,
+            DeclRefExpr = 67,
+            DependentCoawaitExpr = 68,
+            DependentScopeDeclRefExpr = 69,
+            DesignatedInitExpr = 70,
+            DesignatedInitUpdateExpr = 71,
+            ExpressionTraitExpr = 72,
+            ExtVectorElementExpr = 73,
+            FixedPointLiteral = 74,
+            FloatingLiteral = 75,
+            ConstantExpr = 76,
+            ExprWithCleanups = 77,
+            FunctionParmPackExpr = 78,
+            GNUNullExpr = 79,
+            GenericSelectionExpr = 80,
+            ImaginaryLiteral = 81,
+            ImplicitValueInitExpr = 82,
+            InitListExpr = 83,
+            IntegerLiteral = 84,
+            LambdaExpr = 85,
+            MSPropertyRefExpr = 86,
+            MSPropertySubscriptExpr = 87,
+            MaterializeTemporaryExpr = 88,
+            MemberExpr = 89,
+            NoInitExpr = 90,
+            OffsetOfExpr = 107,
+            OpaqueValueExpr = 108,
+            UnresolvedLookupExpr = 109,
+            UnresolvedMemberExpr = 110,
+            PackExpansionExpr = 111,
+            ParenExpr = 112,
+            ParenListExpr = 113,
+            PredefinedExpr = 114,
+            PseudoObjectExpr = 115,
+            ShuffleVectorExpr = 116,
+            SizeOfPackExpr = 117,
+            StmtExpr = 118,
+            StringLiteral = 119,
+            SubstNonTypeTemplateParmExpr = 120,
+            SubstNonTypeTemplateParmPackExpr = 121,
+            TypeTraitExpr = 122,
+            TypoExpr = 123,
+            UnaryExprOrTypeTraitExpr = 124,
+            UnaryOperator = 125,
+            VAArgExpr = 126,
+            ForStmt = 127,
+            GotoStmt = 128,
+            IfStmt = 129,
+            IndirectGotoStmt = 130,
+            LabelStmt = 131,
+            MSDependentExistsStmt = 132,
+            NullStmt = 133,
+            ReturnStmt = 188,
+            SEHExceptStmt = 189,
+            SEHFinallyStmt = 190,
+            SEHLeaveStmt = 191,
+            SEHTryStmt = 192,
+            CaseStmt = 193,
+            DefaultStmt = 194,
+            SwitchStmt = 195,
+            WhileStmt = 196,
+        }
+
         public Stmt()
         {
         }
 
+        public Stmt.StmtClass stmtClass { get; set; }
         public SourceRange SourceRange { get; set; }
+        public SourceLocation BeginLoc { get; set; }
         public SourceLocation EndLoc { get; set; }
         public Stmt StripLabelLikeStatements { get; set; }
     }
diff --git a/src/CppParser/Bindings/CLI/Expr.cpp b/src/CppParser/Bindings/CLI/Expr.cpp
index 34d56de519..313c667020 100644
--- a/src/CppParser/Bindings/CLI/Expr.cpp
+++ b/src/CppParser/Bindings/CLI/Expr.cpp
@@ -155,11 +155,11 @@ CppSharp::Parser::AST::Expr::Expr()
     NativePtr = new ::CppSharp::CppParser::AST::Expr();
 }
 
-CppSharp::Parser::AST::Expr::Expr(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::Expr::Expr(CppSharp::Parser::AST::Stmt::StmtClass klass)
     : CppSharp::Parser::AST::Stmt((::CppSharp::CppParser::AST::Stmt*)nullptr)
 {
     __ownsNativeInstance = true;
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     NativePtr = new ::CppSharp::CppParser::AST::Expr(__arg0);
 }
 
@@ -173,9 +173,9 @@ CppSharp::Parser::AST::Expr::Expr(CppSharp::Parser::AST::Expr^ _0)
     NativePtr = new ::CppSharp::CppParser::AST::Expr(__arg0);
 }
 
-CppSharp::Parser::AST::Expr::operator CppSharp::Parser::AST::Expr^(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::Expr::operator CppSharp::Parser::AST::Expr^(CppSharp::Parser::AST::Stmt::StmtClass klass)
 {
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     auto __ret = (::CppSharp::CppParser::AST::Expr) __arg0;
     auto ____ret = new ::CppSharp::CppParser::AST::Expr(__ret);
     return (____ret == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::Expr((::CppSharp::CppParser::AST::Expr*)____ret);
@@ -344,11 +344,11 @@ CppSharp::Parser::AST::FullExpr::FullExpr()
     NativePtr = new ::CppSharp::CppParser::AST::FullExpr();
 }
 
-CppSharp::Parser::AST::FullExpr::FullExpr(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::FullExpr::FullExpr(CppSharp::Parser::AST::Stmt::StmtClass klass)
     : CppSharp::Parser::AST::Expr((::CppSharp::CppParser::AST::Expr*)nullptr)
 {
     __ownsNativeInstance = true;
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     NativePtr = new ::CppSharp::CppParser::AST::FullExpr(__arg0);
 }
 
@@ -362,9 +362,9 @@ CppSharp::Parser::AST::FullExpr::FullExpr(CppSharp::Parser::AST::FullExpr^ _0)
     NativePtr = new ::CppSharp::CppParser::AST::FullExpr(__arg0);
 }
 
-CppSharp::Parser::AST::FullExpr::operator CppSharp::Parser::AST::FullExpr^(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::FullExpr::operator CppSharp::Parser::AST::FullExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass)
 {
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     auto __ret = (::CppSharp::CppParser::AST::FullExpr) __arg0;
     auto ____ret = new ::CppSharp::CppParser::AST::FullExpr(__ret);
     return (____ret == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::FullExpr((::CppSharp::CppParser::AST::FullExpr*)____ret);
@@ -1634,11 +1634,11 @@ CppSharp::Parser::AST::CallExpr::CallExpr()
     NativePtr = new ::CppSharp::CppParser::AST::CallExpr();
 }
 
-CppSharp::Parser::AST::CallExpr::CallExpr(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::CallExpr::CallExpr(CppSharp::Parser::AST::Stmt::StmtClass klass)
     : CppSharp::Parser::AST::Expr((::CppSharp::CppParser::AST::Expr*)nullptr)
 {
     __ownsNativeInstance = true;
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     NativePtr = new ::CppSharp::CppParser::AST::CallExpr(__arg0);
 }
 
@@ -1672,9 +1672,9 @@ CppSharp::Parser::AST::CallExpr::CallExpr(CppSharp::Parser::AST::CallExpr^ _0)
     NativePtr = new ::CppSharp::CppParser::AST::CallExpr(__arg0);
 }
 
-CppSharp::Parser::AST::CallExpr::operator CppSharp::Parser::AST::CallExpr^(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::CallExpr::operator CppSharp::Parser::AST::CallExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass)
 {
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     auto __ret = (::CppSharp::CppParser::AST::CallExpr) __arg0;
     auto ____ret = new ::CppSharp::CppParser::AST::CallExpr(__ret);
     return (____ret == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::CallExpr((::CppSharp::CppParser::AST::CallExpr*)____ret);
@@ -2045,11 +2045,11 @@ CppSharp::Parser::AST::CastExpr::CastExpr()
     NativePtr = new ::CppSharp::CppParser::AST::CastExpr();
 }
 
-CppSharp::Parser::AST::CastExpr::CastExpr(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::CastExpr::CastExpr(CppSharp::Parser::AST::Stmt::StmtClass klass)
     : CppSharp::Parser::AST::Expr((::CppSharp::CppParser::AST::Expr*)nullptr)
 {
     __ownsNativeInstance = true;
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     NativePtr = new ::CppSharp::CppParser::AST::CastExpr(__arg0);
 }
 
@@ -2063,9 +2063,9 @@ CppSharp::Parser::AST::CastExpr::CastExpr(CppSharp::Parser::AST::CastExpr^ _0)
     NativePtr = new ::CppSharp::CppParser::AST::CastExpr(__arg0);
 }
 
-CppSharp::Parser::AST::CastExpr::operator CppSharp::Parser::AST::CastExpr^(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::CastExpr::operator CppSharp::Parser::AST::CastExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass)
 {
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     auto __ret = (::CppSharp::CppParser::AST::CastExpr) __arg0;
     auto ____ret = new ::CppSharp::CppParser::AST::CastExpr(__ret);
     return (____ret == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::CastExpr((::CppSharp::CppParser::AST::CastExpr*)____ret);
@@ -2204,11 +2204,11 @@ CppSharp::Parser::AST::ExplicitCastExpr::ExplicitCastExpr()
     NativePtr = new ::CppSharp::CppParser::AST::ExplicitCastExpr();
 }
 
-CppSharp::Parser::AST::ExplicitCastExpr::ExplicitCastExpr(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::ExplicitCastExpr::ExplicitCastExpr(CppSharp::Parser::AST::Stmt::StmtClass klass)
     : CppSharp::Parser::AST::CastExpr((::CppSharp::CppParser::AST::CastExpr*)nullptr)
 {
     __ownsNativeInstance = true;
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     NativePtr = new ::CppSharp::CppParser::AST::ExplicitCastExpr(__arg0);
 }
 
@@ -2222,9 +2222,9 @@ CppSharp::Parser::AST::ExplicitCastExpr::ExplicitCastExpr(CppSharp::Parser::AST:
     NativePtr = new ::CppSharp::CppParser::AST::ExplicitCastExpr(__arg0);
 }
 
-CppSharp::Parser::AST::ExplicitCastExpr::operator CppSharp::Parser::AST::ExplicitCastExpr^(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::ExplicitCastExpr::operator CppSharp::Parser::AST::ExplicitCastExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass)
 {
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     auto __ret = (::CppSharp::CppParser::AST::ExplicitCastExpr) __arg0;
     auto ____ret = new ::CppSharp::CppParser::AST::ExplicitCastExpr(__ret);
     return (____ret == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::ExplicitCastExpr((::CppSharp::CppParser::AST::ExplicitCastExpr*)____ret);
@@ -2322,11 +2322,11 @@ CppSharp::Parser::AST::BinaryOperator::BinaryOperator()
     NativePtr = new ::CppSharp::CppParser::AST::BinaryOperator();
 }
 
-CppSharp::Parser::AST::BinaryOperator::BinaryOperator(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::BinaryOperator::BinaryOperator(CppSharp::Parser::AST::Stmt::StmtClass klass)
     : CppSharp::Parser::AST::Expr((::CppSharp::CppParser::AST::Expr*)nullptr)
 {
     __ownsNativeInstance = true;
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     NativePtr = new ::CppSharp::CppParser::AST::BinaryOperator(__arg0);
 }
 
@@ -2340,9 +2340,9 @@ CppSharp::Parser::AST::BinaryOperator::BinaryOperator(CppSharp::Parser::AST::Bin
     NativePtr = new ::CppSharp::CppParser::AST::BinaryOperator(__arg0);
 }
 
-CppSharp::Parser::AST::BinaryOperator::operator CppSharp::Parser::AST::BinaryOperator^(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::BinaryOperator::operator CppSharp::Parser::AST::BinaryOperator^(CppSharp::Parser::AST::Stmt::StmtClass klass)
 {
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     auto __ret = (::CppSharp::CppParser::AST::BinaryOperator) __arg0;
     auto ____ret = new ::CppSharp::CppParser::AST::BinaryOperator(__ret);
     return (____ret == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::BinaryOperator((::CppSharp::CppParser::AST::BinaryOperator*)____ret);
@@ -2618,11 +2618,11 @@ CppSharp::Parser::AST::AbstractConditionalOperator::AbstractConditionalOperator(
     NativePtr = new ::CppSharp::CppParser::AST::AbstractConditionalOperator();
 }
 
-CppSharp::Parser::AST::AbstractConditionalOperator::AbstractConditionalOperator(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::AbstractConditionalOperator::AbstractConditionalOperator(CppSharp::Parser::AST::Stmt::StmtClass klass)
     : CppSharp::Parser::AST::Expr((::CppSharp::CppParser::AST::Expr*)nullptr)
 {
     __ownsNativeInstance = true;
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     NativePtr = new ::CppSharp::CppParser::AST::AbstractConditionalOperator(__arg0);
 }
 
@@ -2636,9 +2636,9 @@ CppSharp::Parser::AST::AbstractConditionalOperator::AbstractConditionalOperator(
     NativePtr = new ::CppSharp::CppParser::AST::AbstractConditionalOperator(__arg0);
 }
 
-CppSharp::Parser::AST::AbstractConditionalOperator::operator CppSharp::Parser::AST::AbstractConditionalOperator^(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::AbstractConditionalOperator::operator CppSharp::Parser::AST::AbstractConditionalOperator^(CppSharp::Parser::AST::Stmt::StmtClass klass)
 {
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     auto __ret = (::CppSharp::CppParser::AST::AbstractConditionalOperator) __arg0;
     auto ____ret = new ::CppSharp::CppParser::AST::AbstractConditionalOperator(__ret);
     return (____ret == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::AbstractConditionalOperator((::CppSharp::CppParser::AST::AbstractConditionalOperator*)____ret);
@@ -4851,11 +4851,11 @@ CppSharp::Parser::AST::CXXNamedCastExpr::CXXNamedCastExpr()
     NativePtr = new ::CppSharp::CppParser::AST::CXXNamedCastExpr();
 }
 
-CppSharp::Parser::AST::CXXNamedCastExpr::CXXNamedCastExpr(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::CXXNamedCastExpr::CXXNamedCastExpr(CppSharp::Parser::AST::Stmt::StmtClass klass)
     : CppSharp::Parser::AST::ExplicitCastExpr((::CppSharp::CppParser::AST::ExplicitCastExpr*)nullptr)
 {
     __ownsNativeInstance = true;
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     NativePtr = new ::CppSharp::CppParser::AST::CXXNamedCastExpr(__arg0);
 }
 
@@ -4869,9 +4869,9 @@ CppSharp::Parser::AST::CXXNamedCastExpr::CXXNamedCastExpr(CppSharp::Parser::AST:
     NativePtr = new ::CppSharp::CppParser::AST::CXXNamedCastExpr(__arg0);
 }
 
-CppSharp::Parser::AST::CXXNamedCastExpr::operator CppSharp::Parser::AST::CXXNamedCastExpr^(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::CXXNamedCastExpr::operator CppSharp::Parser::AST::CXXNamedCastExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass)
 {
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     auto __ret = (::CppSharp::CppParser::AST::CXXNamedCastExpr) __arg0;
     auto ____ret = new ::CppSharp::CppParser::AST::CXXNamedCastExpr(__ret);
     return (____ret == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::CXXNamedCastExpr((::CppSharp::CppParser::AST::CXXNamedCastExpr*)____ret);
@@ -5814,11 +5814,11 @@ CppSharp::Parser::AST::CXXConstructExpr::CXXConstructExpr()
     NativePtr = new ::CppSharp::CppParser::AST::CXXConstructExpr();
 }
 
-CppSharp::Parser::AST::CXXConstructExpr::CXXConstructExpr(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::CXXConstructExpr::CXXConstructExpr(CppSharp::Parser::AST::Stmt::StmtClass klass)
     : CppSharp::Parser::AST::Expr((::CppSharp::CppParser::AST::Expr*)nullptr)
 {
     __ownsNativeInstance = true;
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     NativePtr = new ::CppSharp::CppParser::AST::CXXConstructExpr(__arg0);
 }
 
@@ -5852,9 +5852,9 @@ CppSharp::Parser::AST::CXXConstructExpr::CXXConstructExpr(CppSharp::Parser::AST:
     NativePtr = new ::CppSharp::CppParser::AST::CXXConstructExpr(__arg0);
 }
 
-CppSharp::Parser::AST::CXXConstructExpr::operator CppSharp::Parser::AST::CXXConstructExpr^(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::CXXConstructExpr::operator CppSharp::Parser::AST::CXXConstructExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass)
 {
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     auto __ret = (::CppSharp::CppParser::AST::CXXConstructExpr) __arg0;
     auto ____ret = new ::CppSharp::CppParser::AST::CXXConstructExpr(__ret);
     return (____ret == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::CXXConstructExpr((::CppSharp::CppParser::AST::CXXConstructExpr*)____ret);
@@ -7014,11 +7014,11 @@ CppSharp::Parser::AST::OverloadExpr::OverloadExpr()
     NativePtr = new ::CppSharp::CppParser::AST::OverloadExpr();
 }
 
-CppSharp::Parser::AST::OverloadExpr::OverloadExpr(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::OverloadExpr::OverloadExpr(CppSharp::Parser::AST::Stmt::StmtClass klass)
     : CppSharp::Parser::AST::Expr((::CppSharp::CppParser::AST::Expr*)nullptr)
 {
     __ownsNativeInstance = true;
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     NativePtr = new ::CppSharp::CppParser::AST::OverloadExpr(__arg0);
 }
 
@@ -7032,9 +7032,9 @@ CppSharp::Parser::AST::OverloadExpr::OverloadExpr(CppSharp::Parser::AST::Overloa
     NativePtr = new ::CppSharp::CppParser::AST::OverloadExpr(__arg0);
 }
 
-CppSharp::Parser::AST::OverloadExpr::operator CppSharp::Parser::AST::OverloadExpr^(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::OverloadExpr::operator CppSharp::Parser::AST::OverloadExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass)
 {
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     auto __ret = (::CppSharp::CppParser::AST::OverloadExpr) __arg0;
     auto ____ret = new ::CppSharp::CppParser::AST::OverloadExpr(__ret);
     return (____ret == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::OverloadExpr((::CppSharp::CppParser::AST::OverloadExpr*)____ret);
@@ -8359,11 +8359,11 @@ CppSharp::Parser::AST::CoroutineSuspendExpr::CoroutineSuspendExpr()
     NativePtr = new ::CppSharp::CppParser::AST::CoroutineSuspendExpr();
 }
 
-CppSharp::Parser::AST::CoroutineSuspendExpr::CoroutineSuspendExpr(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::CoroutineSuspendExpr::CoroutineSuspendExpr(CppSharp::Parser::AST::Stmt::StmtClass klass)
     : CppSharp::Parser::AST::Expr((::CppSharp::CppParser::AST::Expr*)nullptr)
 {
     __ownsNativeInstance = true;
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     NativePtr = new ::CppSharp::CppParser::AST::CoroutineSuspendExpr(__arg0);
 }
 
@@ -8377,9 +8377,9 @@ CppSharp::Parser::AST::CoroutineSuspendExpr::CoroutineSuspendExpr(CppSharp::Pars
     NativePtr = new ::CppSharp::CppParser::AST::CoroutineSuspendExpr(__arg0);
 }
 
-CppSharp::Parser::AST::CoroutineSuspendExpr::operator CppSharp::Parser::AST::CoroutineSuspendExpr^(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::CoroutineSuspendExpr::operator CppSharp::Parser::AST::CoroutineSuspendExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass)
 {
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     auto __ret = (::CppSharp::CppParser::AST::CoroutineSuspendExpr) __arg0;
     auto ____ret = new ::CppSharp::CppParser::AST::CoroutineSuspendExpr(__ret);
     return (____ret == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::CoroutineSuspendExpr((::CppSharp::CppParser::AST::CoroutineSuspendExpr*)____ret);
diff --git a/src/CppParser/Bindings/CLI/Expr.h b/src/CppParser/Bindings/CLI/Expr.h
index 25394bb6c7..d2bc718c0c 100644
--- a/src/CppParser/Bindings/CLI/Expr.h
+++ b/src/CppParser/Bindings/CLI/Expr.h
@@ -22,7 +22,6 @@ namespace CppSharp
             enum struct CastKind;
             enum struct ObjCBridgeCastKind;
             enum struct OverloadedOperatorKind;
-            enum struct StmtClass;
             enum struct UnaryExprOrTypeTrait;
             enum struct UnaryOperatorKind;
             ref class AbstractConditionalOperator;
@@ -503,7 +502,7 @@ namespace CppSharp
                 static Expr^ __CreateInstance(::System::IntPtr native);
                 Expr();
 
-                Expr(CppSharp::Parser::AST::StmtClass klass);
+                Expr(CppSharp::Parser::AST::Stmt::StmtClass klass);
 
                 Expr(CppSharp::Parser::AST::Expr^ _0);
 
@@ -593,7 +592,7 @@ namespace CppSharp
                     void set(bool);
                 }
 
-                static operator CppSharp::Parser::AST::Expr^(CppSharp::Parser::AST::StmtClass klass);
+                static operator CppSharp::Parser::AST::Expr^(CppSharp::Parser::AST::Stmt::StmtClass klass);
             };
 
             public ref class FullExpr : CppSharp::Parser::AST::Expr
@@ -604,7 +603,7 @@ namespace CppSharp
                 static FullExpr^ __CreateInstance(::System::IntPtr native);
                 FullExpr();
 
-                FullExpr(CppSharp::Parser::AST::StmtClass klass);
+                FullExpr(CppSharp::Parser::AST::Stmt::StmtClass klass);
 
                 FullExpr(CppSharp::Parser::AST::FullExpr^ _0);
 
@@ -616,7 +615,7 @@ namespace CppSharp
                     void set(CppSharp::Parser::AST::Expr^);
                 }
 
-                static operator CppSharp::Parser::AST::FullExpr^(CppSharp::Parser::AST::StmtClass klass);
+                static operator CppSharp::Parser::AST::FullExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass);
             };
 
             public ref class ConstantExpr : CppSharp::Parser::AST::FullExpr
@@ -1284,7 +1283,7 @@ namespace CppSharp
                 static CallExpr^ __CreateInstance(::System::IntPtr native);
                 CallExpr();
 
-                CallExpr(CppSharp::Parser::AST::StmtClass klass);
+                CallExpr(CppSharp::Parser::AST::Stmt::StmtClass klass);
 
                 CallExpr(CppSharp::Parser::AST::CallExpr^ _0);
 
@@ -1355,7 +1354,7 @@ namespace CppSharp
 
                 void Cleararguments();
 
-                static operator CppSharp::Parser::AST::CallExpr^(CppSharp::Parser::AST::StmtClass klass);
+                static operator CppSharp::Parser::AST::CallExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass);
             };
 
             public ref class MemberExpr : CppSharp::Parser::AST::Expr
@@ -1488,7 +1487,7 @@ namespace CppSharp
                 static CastExpr^ __CreateInstance(::System::IntPtr native);
                 CastExpr();
 
-                CastExpr(CppSharp::Parser::AST::StmtClass klass);
+                CastExpr(CppSharp::Parser::AST::Stmt::StmtClass klass);
 
                 CastExpr(CppSharp::Parser::AST::CastExpr^ _0);
 
@@ -1536,7 +1535,7 @@ namespace CppSharp
                     void set(unsigned int);
                 }
 
-                static operator CppSharp::Parser::AST::CastExpr^(CppSharp::Parser::AST::StmtClass klass);
+                static operator CppSharp::Parser::AST::CastExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass);
             };
 
             public ref class ImplicitCastExpr : CppSharp::Parser::AST::CastExpr
@@ -1571,7 +1570,7 @@ namespace CppSharp
                 static ExplicitCastExpr^ __CreateInstance(::System::IntPtr native);
                 ExplicitCastExpr();
 
-                ExplicitCastExpr(CppSharp::Parser::AST::StmtClass klass);
+                ExplicitCastExpr(CppSharp::Parser::AST::Stmt::StmtClass klass);
 
                 ExplicitCastExpr(CppSharp::Parser::AST::ExplicitCastExpr^ _0);
 
@@ -1583,7 +1582,7 @@ namespace CppSharp
                     void set(CppSharp::Parser::AST::QualifiedType^);
                 }
 
-                static operator CppSharp::Parser::AST::ExplicitCastExpr^(CppSharp::Parser::AST::StmtClass klass);
+                static operator CppSharp::Parser::AST::ExplicitCastExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass);
             };
 
             public ref class CStyleCastExpr : CppSharp::Parser::AST::ExplicitCastExpr
@@ -1619,7 +1618,7 @@ namespace CppSharp
                 static BinaryOperator^ __CreateInstance(::System::IntPtr native);
                 BinaryOperator();
 
-                BinaryOperator(CppSharp::Parser::AST::StmtClass klass);
+                BinaryOperator(CppSharp::Parser::AST::Stmt::StmtClass klass);
 
                 BinaryOperator(CppSharp::Parser::AST::BinaryOperator^ _0);
 
@@ -1739,7 +1738,7 @@ namespace CppSharp
                     void set(bool);
                 }
 
-                static operator CppSharp::Parser::AST::BinaryOperator^(CppSharp::Parser::AST::StmtClass klass);
+                static operator CppSharp::Parser::AST::BinaryOperator^(CppSharp::Parser::AST::Stmt::StmtClass klass);
             };
 
             public ref class CompoundAssignOperator : CppSharp::Parser::AST::BinaryOperator
@@ -1775,7 +1774,7 @@ namespace CppSharp
                 static AbstractConditionalOperator^ __CreateInstance(::System::IntPtr native);
                 AbstractConditionalOperator();
 
-                AbstractConditionalOperator(CppSharp::Parser::AST::StmtClass klass);
+                AbstractConditionalOperator(CppSharp::Parser::AST::Stmt::StmtClass klass);
 
                 AbstractConditionalOperator(CppSharp::Parser::AST::AbstractConditionalOperator^ _0);
 
@@ -1811,7 +1810,7 @@ namespace CppSharp
                     void set(CppSharp::Parser::SourceLocation);
                 }
 
-                static operator CppSharp::Parser::AST::AbstractConditionalOperator^(CppSharp::Parser::AST::StmtClass klass);
+                static operator CppSharp::Parser::AST::AbstractConditionalOperator^(CppSharp::Parser::AST::Stmt::StmtClass klass);
             };
 
             public ref class ConditionalOperator : CppSharp::Parser::AST::AbstractConditionalOperator
@@ -2946,7 +2945,7 @@ namespace CppSharp
                 static CXXNamedCastExpr^ __CreateInstance(::System::IntPtr native);
                 CXXNamedCastExpr();
 
-                CXXNamedCastExpr(CppSharp::Parser::AST::StmtClass klass);
+                CXXNamedCastExpr(CppSharp::Parser::AST::Stmt::StmtClass klass);
 
                 CXXNamedCastExpr(CppSharp::Parser::AST::CXXNamedCastExpr^ _0);
 
@@ -2976,7 +2975,7 @@ namespace CppSharp
                     void set(CppSharp::Parser::SourceRange^);
                 }
 
-                static operator CppSharp::Parser::AST::CXXNamedCastExpr^(CppSharp::Parser::AST::StmtClass klass);
+                static operator CppSharp::Parser::AST::CXXNamedCastExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass);
             };
 
             public ref class CXXStaticCastExpr : CppSharp::Parser::AST::CXXNamedCastExpr
@@ -3412,7 +3411,7 @@ namespace CppSharp
                 static CXXConstructExpr^ __CreateInstance(::System::IntPtr native);
                 CXXConstructExpr();
 
-                CXXConstructExpr(CppSharp::Parser::AST::StmtClass klass);
+                CXXConstructExpr(CppSharp::Parser::AST::Stmt::StmtClass klass);
 
                 CXXConstructExpr(CppSharp::Parser::AST::CXXConstructExpr^ _0);
 
@@ -3483,7 +3482,7 @@ namespace CppSharp
 
                 void Cleararguments();
 
-                static operator CppSharp::Parser::AST::CXXConstructExpr^(CppSharp::Parser::AST::StmtClass klass);
+                static operator CppSharp::Parser::AST::CXXConstructExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass);
             };
 
             public ref class CXXInheritedCtorInitExpr : CppSharp::Parser::AST::Expr
@@ -4007,7 +4006,7 @@ namespace CppSharp
                 static OverloadExpr^ __CreateInstance(::System::IntPtr native);
                 OverloadExpr();
 
-                OverloadExpr(CppSharp::Parser::AST::StmtClass klass);
+                OverloadExpr(CppSharp::Parser::AST::Stmt::StmtClass klass);
 
                 OverloadExpr(CppSharp::Parser::AST::OverloadExpr^ _0);
 
@@ -4061,7 +4060,7 @@ namespace CppSharp
                     void set(unsigned int);
                 }
 
-                static operator CppSharp::Parser::AST::OverloadExpr^(CppSharp::Parser::AST::StmtClass klass);
+                static operator CppSharp::Parser::AST::OverloadExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass);
             };
 
             public ref class UnresolvedLookupExpr : CppSharp::Parser::AST::OverloadExpr
@@ -4687,7 +4686,7 @@ namespace CppSharp
                 static CoroutineSuspendExpr^ __CreateInstance(::System::IntPtr native);
                 CoroutineSuspendExpr();
 
-                CoroutineSuspendExpr(CppSharp::Parser::AST::StmtClass klass);
+                CoroutineSuspendExpr(CppSharp::Parser::AST::Stmt::StmtClass klass);
 
                 CoroutineSuspendExpr(CppSharp::Parser::AST::CoroutineSuspendExpr^ _0);
 
@@ -4729,7 +4728,7 @@ namespace CppSharp
                     void set(CppSharp::Parser::AST::Expr^);
                 }
 
-                static operator CppSharp::Parser::AST::CoroutineSuspendExpr^(CppSharp::Parser::AST::StmtClass klass);
+                static operator CppSharp::Parser::AST::CoroutineSuspendExpr^(CppSharp::Parser::AST::Stmt::StmtClass klass);
             };
 
             public ref class CoawaitExpr : CppSharp::Parser::AST::CoroutineSuspendExpr
diff --git a/src/CppParser/Bindings/CLI/Stmt.cpp b/src/CppParser/Bindings/CLI/Stmt.cpp
index 166c725097..3d6a57b494 100644
--- a/src/CppParser/Bindings/CLI/Stmt.cpp
+++ b/src/CppParser/Bindings/CLI/Stmt.cpp
@@ -35,10 +35,10 @@ CppSharp::Parser::AST::Stmt::Stmt()
     NativePtr = new ::CppSharp::CppParser::AST::Stmt();
 }
 
-CppSharp::Parser::AST::Stmt::Stmt(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::Stmt::Stmt(CppSharp::Parser::AST::Stmt::StmtClass klass)
 {
     __ownsNativeInstance = true;
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     NativePtr = new ::CppSharp::CppParser::AST::Stmt(__arg0);
 }
 
@@ -51,9 +51,9 @@ CppSharp::Parser::AST::Stmt::Stmt(CppSharp::Parser::AST::Stmt^ _0)
     NativePtr = new ::CppSharp::CppParser::AST::Stmt(__arg0);
 }
 
-CppSharp::Parser::AST::Stmt::operator CppSharp::Parser::AST::Stmt^(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::Stmt::operator CppSharp::Parser::AST::Stmt^(CppSharp::Parser::AST::Stmt::StmtClass klass)
 {
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     auto __ret = (::CppSharp::CppParser::AST::Stmt) __arg0;
     auto ____ret = new ::CppSharp::CppParser::AST::Stmt(__ret);
     return (____ret == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::Stmt((::CppSharp::CppParser::AST::Stmt*)____ret);
@@ -69,14 +69,14 @@ void CppSharp::Parser::AST::Stmt::__Instance::set(System::IntPtr object)
     NativePtr = (::CppSharp::CppParser::AST::Stmt*)object.ToPointer();
 }
 
-CppSharp::Parser::AST::StmtClass CppSharp::Parser::AST::Stmt::StmtClass::get()
+CppSharp::Parser::AST::Stmt::StmtClass CppSharp::Parser::AST::Stmt::stmtClass::get()
 {
-    return (CppSharp::Parser::AST::StmtClass)((::CppSharp::CppParser::AST::Stmt*)NativePtr)->stmtClass;
+    return (CppSharp::Parser::AST::Stmt::StmtClass)((::CppSharp::CppParser::AST::Stmt*)NativePtr)->stmtClass;
 }
 
-void CppSharp::Parser::AST::Stmt::StmtClass::set(CppSharp::Parser::AST::StmtClass value)
+void CppSharp::Parser::AST::Stmt::stmtClass::set(CppSharp::Parser::AST::Stmt::StmtClass value)
 {
-    ((::CppSharp::CppParser::AST::Stmt*)NativePtr)->stmtClass = (::CppSharp::CppParser::AST::StmtClass)value;
+    ((::CppSharp::CppParser::AST::Stmt*)NativePtr)->stmtClass = (::CppSharp::CppParser::AST::Stmt::StmtClass)value;
 }
 
 CppSharp::Parser::SourceRange^ CppSharp::Parser::AST::Stmt::SourceRange::get()
@@ -89,6 +89,18 @@ void CppSharp::Parser::AST::Stmt::SourceRange::set(CppSharp::Parser::SourceRange
     ((::CppSharp::CppParser::AST::Stmt*)NativePtr)->sourceRange = *(::CppSharp::CppParser::SourceRange*)value->NativePtr;
 }
 
+CppSharp::Parser::SourceLocation CppSharp::Parser::AST::Stmt::BeginLoc::get()
+{
+    return CppSharp::Parser::SourceLocation((::CppSharp::CppParser::SourceLocation*)&((::CppSharp::CppParser::AST::Stmt*)NativePtr)->beginLoc);
+}
+
+void CppSharp::Parser::AST::Stmt::BeginLoc::set(CppSharp::Parser::SourceLocation value)
+{
+    auto _marshal0 = ::CppSharp::CppParser::SourceLocation();
+    _marshal0.ID = value.ID;
+    ((::CppSharp::CppParser::AST::Stmt*)NativePtr)->beginLoc = _marshal0;
+}
+
 CppSharp::Parser::SourceLocation CppSharp::Parser::AST::Stmt::EndLoc::get()
 {
     return CppSharp::Parser::SourceLocation((::CppSharp::CppParser::SourceLocation*)&((::CppSharp::CppParser::AST::Stmt*)NativePtr)->endLoc);
@@ -439,11 +451,11 @@ CppSharp::Parser::AST::SwitchCase::SwitchCase()
     NativePtr = new ::CppSharp::CppParser::AST::SwitchCase();
 }
 
-CppSharp::Parser::AST::SwitchCase::SwitchCase(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::SwitchCase::SwitchCase(CppSharp::Parser::AST::Stmt::StmtClass klass)
     : CppSharp::Parser::AST::Stmt((::CppSharp::CppParser::AST::Stmt*)nullptr)
 {
     __ownsNativeInstance = true;
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     NativePtr = new ::CppSharp::CppParser::AST::SwitchCase(__arg0);
 }
 
@@ -457,9 +469,9 @@ CppSharp::Parser::AST::SwitchCase::SwitchCase(CppSharp::Parser::AST::SwitchCase^
     NativePtr = new ::CppSharp::CppParser::AST::SwitchCase(__arg0);
 }
 
-CppSharp::Parser::AST::SwitchCase::operator CppSharp::Parser::AST::SwitchCase^(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::SwitchCase::operator CppSharp::Parser::AST::SwitchCase^(CppSharp::Parser::AST::Stmt::StmtClass klass)
 {
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     auto __ret = (::CppSharp::CppParser::AST::SwitchCase) __arg0;
     auto ____ret = new ::CppSharp::CppParser::AST::SwitchCase(__ret);
     return (____ret == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::SwitchCase((::CppSharp::CppParser::AST::SwitchCase*)____ret);
@@ -1585,11 +1597,11 @@ CppSharp::Parser::AST::AsmStmt::AsmStmt()
     NativePtr = new ::CppSharp::CppParser::AST::AsmStmt();
 }
 
-CppSharp::Parser::AST::AsmStmt::AsmStmt(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::AsmStmt::AsmStmt(CppSharp::Parser::AST::Stmt::StmtClass klass)
     : CppSharp::Parser::AST::Stmt((::CppSharp::CppParser::AST::Stmt*)nullptr)
 {
     __ownsNativeInstance = true;
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     NativePtr = new ::CppSharp::CppParser::AST::AsmStmt(__arg0);
 }
 
@@ -1643,9 +1655,9 @@ CppSharp::Parser::AST::AsmStmt::AsmStmt(CppSharp::Parser::AST::AsmStmt^ _0)
     NativePtr = new ::CppSharp::CppParser::AST::AsmStmt(__arg0);
 }
 
-CppSharp::Parser::AST::AsmStmt::operator CppSharp::Parser::AST::AsmStmt^(CppSharp::Parser::AST::StmtClass klass)
+CppSharp::Parser::AST::AsmStmt::operator CppSharp::Parser::AST::AsmStmt^(CppSharp::Parser::AST::Stmt::StmtClass klass)
 {
-    auto __arg0 = (::CppSharp::CppParser::AST::StmtClass)klass;
+    auto __arg0 = (::CppSharp::CppParser::AST::Stmt::StmtClass)klass;
     auto __ret = (::CppSharp::CppParser::AST::AsmStmt) __arg0;
     auto ____ret = new ::CppSharp::CppParser::AST::AsmStmt(__ret);
     return (____ret == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::AsmStmt((::CppSharp::CppParser::AST::AsmStmt*)____ret);
diff --git a/src/CppParser/Bindings/CLI/Stmt.h b/src/CppParser/Bindings/CLI/Stmt.h
index 4aba4b73f1..1755111233 100644
--- a/src/CppParser/Bindings/CLI/Stmt.h
+++ b/src/CppParser/Bindings/CLI/Stmt.h
@@ -17,7 +17,6 @@ namespace CppSharp
         ref class SourceRange;
         namespace AST
         {
-            enum struct StmtClass;
             ref class AsmStmt;
             ref class AttributedStmt;
             ref class BreakStmt;
@@ -64,140 +63,140 @@ namespace CppSharp
     {
         namespace AST
         {
-            public enum struct StmtClass
-            {
-                NoStmt = 0,
-                GCCAsmStmt = 1,
-                MSAsmStmt = 2,
-                AttributedStmt = 3,
-                BreakStmt = 4,
-                CXXCatchStmt = 5,
-                CXXForRangeStmt = 6,
-                CXXTryStmt = 7,
-                CapturedStmt = 8,
-                CompoundStmt = 9,
-                ContinueStmt = 10,
-                CoreturnStmt = 11,
-                CoroutineBodyStmt = 12,
-                DeclStmt = 13,
-                DoStmt = 14,
-                BinaryConditionalOperator = 15,
-                ConditionalOperator = 16,
-                AddrLabelExpr = 17,
-                ArrayInitIndexExpr = 18,
-                ArrayInitLoopExpr = 19,
-                ArraySubscriptExpr = 20,
-                ArrayTypeTraitExpr = 21,
-                AsTypeExpr = 22,
-                AtomicExpr = 23,
-                BinaryOperator = 24,
-                CompoundAssignOperator = 25,
-                BlockExpr = 26,
-                CXXBindTemporaryExpr = 27,
-                CXXBoolLiteralExpr = 28,
-                CXXConstructExpr = 29,
-                CXXTemporaryObjectExpr = 30,
-                CXXDefaultArgExpr = 31,
-                CXXDefaultInitExpr = 32,
-                CXXDeleteExpr = 33,
-                CXXDependentScopeMemberExpr = 34,
-                CXXFoldExpr = 35,
-                CXXInheritedCtorInitExpr = 36,
-                CXXNewExpr = 37,
-                CXXNoexceptExpr = 38,
-                CXXNullPtrLiteralExpr = 39,
-                CXXPseudoDestructorExpr = 40,
-                CXXScalarValueInitExpr = 41,
-                CXXStdInitializerListExpr = 42,
-                CXXThisExpr = 43,
-                CXXThrowExpr = 44,
-                CXXTypeidExpr = 45,
-                CXXUnresolvedConstructExpr = 46,
-                CXXUuidofExpr = 47,
-                CallExpr = 48,
-                CUDAKernelCallExpr = 49,
-                CXXMemberCallExpr = 50,
-                CXXOperatorCallExpr = 51,
-                UserDefinedLiteral = 52,
-                CStyleCastExpr = 53,
-                CXXFunctionalCastExpr = 54,
-                CXXConstCastExpr = 55,
-                CXXDynamicCastExpr = 56,
-                CXXReinterpretCastExpr = 57,
-                CXXStaticCastExpr = 58,
-                ImplicitCastExpr = 60,
-                CharacterLiteral = 61,
-                ChooseExpr = 62,
-                CompoundLiteralExpr = 63,
-                ConvertVectorExpr = 64,
-                CoawaitExpr = 65,
-                CoyieldExpr = 66,
-                DeclRefExpr = 67,
-                DependentCoawaitExpr = 68,
-                DependentScopeDeclRefExpr = 69,
-                DesignatedInitExpr = 70,
-                DesignatedInitUpdateExpr = 71,
-                ExpressionTraitExpr = 72,
-                ExtVectorElementExpr = 73,
-                FixedPointLiteral = 74,
-                FloatingLiteral = 75,
-                ConstantExpr = 76,
-                ExprWithCleanups = 77,
-                FunctionParmPackExpr = 78,
-                GNUNullExpr = 79,
-                GenericSelectionExpr = 80,
-                ImaginaryLiteral = 81,
-                ImplicitValueInitExpr = 82,
-                InitListExpr = 83,
-                IntegerLiteral = 84,
-                LambdaExpr = 85,
-                MSPropertyRefExpr = 86,
-                MSPropertySubscriptExpr = 87,
-                MaterializeTemporaryExpr = 88,
-                MemberExpr = 89,
-                NoInitExpr = 90,
-                OffsetOfExpr = 107,
-                OpaqueValueExpr = 108,
-                UnresolvedLookupExpr = 109,
-                UnresolvedMemberExpr = 110,
-                PackExpansionExpr = 111,
-                ParenExpr = 112,
-                ParenListExpr = 113,
-                PredefinedExpr = 114,
-                PseudoObjectExpr = 115,
-                ShuffleVectorExpr = 116,
-                SizeOfPackExpr = 117,
-                StmtExpr = 118,
-                StringLiteral = 119,
-                SubstNonTypeTemplateParmExpr = 120,
-                SubstNonTypeTemplateParmPackExpr = 121,
-                TypeTraitExpr = 122,
-                TypoExpr = 123,
-                UnaryExprOrTypeTraitExpr = 124,
-                UnaryOperator = 125,
-                VAArgExpr = 126,
-                ForStmt = 127,
-                GotoStmt = 128,
-                IfStmt = 129,
-                IndirectGotoStmt = 130,
-                LabelStmt = 131,
-                MSDependentExistsStmt = 132,
-                NullStmt = 133,
-                ReturnStmt = 188,
-                SEHExceptStmt = 189,
-                SEHFinallyStmt = 190,
-                SEHLeaveStmt = 191,
-                SEHTryStmt = 192,
-                CaseStmt = 193,
-                DefaultStmt = 194,
-                SwitchStmt = 195,
-                WhileStmt = 196
-            };
-
             public ref class Stmt : ICppInstance
             {
             public:
 
+                enum struct StmtClass
+                {
+                    NoStmt = 0,
+                    GCCAsmStmt = 1,
+                    MSAsmStmt = 2,
+                    AttributedStmt = 3,
+                    BreakStmt = 4,
+                    CXXCatchStmt = 5,
+                    CXXForRangeStmt = 6,
+                    CXXTryStmt = 7,
+                    CapturedStmt = 8,
+                    CompoundStmt = 9,
+                    ContinueStmt = 10,
+                    CoreturnStmt = 11,
+                    CoroutineBodyStmt = 12,
+                    DeclStmt = 13,
+                    DoStmt = 14,
+                    BinaryConditionalOperator = 15,
+                    ConditionalOperator = 16,
+                    AddrLabelExpr = 17,
+                    ArrayInitIndexExpr = 18,
+                    ArrayInitLoopExpr = 19,
+                    ArraySubscriptExpr = 20,
+                    ArrayTypeTraitExpr = 21,
+                    AsTypeExpr = 22,
+                    AtomicExpr = 23,
+                    BinaryOperator = 24,
+                    CompoundAssignOperator = 25,
+                    BlockExpr = 26,
+                    CXXBindTemporaryExpr = 27,
+                    CXXBoolLiteralExpr = 28,
+                    CXXConstructExpr = 29,
+                    CXXTemporaryObjectExpr = 30,
+                    CXXDefaultArgExpr = 31,
+                    CXXDefaultInitExpr = 32,
+                    CXXDeleteExpr = 33,
+                    CXXDependentScopeMemberExpr = 34,
+                    CXXFoldExpr = 35,
+                    CXXInheritedCtorInitExpr = 36,
+                    CXXNewExpr = 37,
+                    CXXNoexceptExpr = 38,
+                    CXXNullPtrLiteralExpr = 39,
+                    CXXPseudoDestructorExpr = 40,
+                    CXXScalarValueInitExpr = 41,
+                    CXXStdInitializerListExpr = 42,
+                    CXXThisExpr = 43,
+                    CXXThrowExpr = 44,
+                    CXXTypeidExpr = 45,
+                    CXXUnresolvedConstructExpr = 46,
+                    CXXUuidofExpr = 47,
+                    CallExpr = 48,
+                    CUDAKernelCallExpr = 49,
+                    CXXMemberCallExpr = 50,
+                    CXXOperatorCallExpr = 51,
+                    UserDefinedLiteral = 52,
+                    CStyleCastExpr = 53,
+                    CXXFunctionalCastExpr = 54,
+                    CXXConstCastExpr = 55,
+                    CXXDynamicCastExpr = 56,
+                    CXXReinterpretCastExpr = 57,
+                    CXXStaticCastExpr = 58,
+                    ImplicitCastExpr = 60,
+                    CharacterLiteral = 61,
+                    ChooseExpr = 62,
+                    CompoundLiteralExpr = 63,
+                    ConvertVectorExpr = 64,
+                    CoawaitExpr = 65,
+                    CoyieldExpr = 66,
+                    DeclRefExpr = 67,
+                    DependentCoawaitExpr = 68,
+                    DependentScopeDeclRefExpr = 69,
+                    DesignatedInitExpr = 70,
+                    DesignatedInitUpdateExpr = 71,
+                    ExpressionTraitExpr = 72,
+                    ExtVectorElementExpr = 73,
+                    FixedPointLiteral = 74,
+                    FloatingLiteral = 75,
+                    ConstantExpr = 76,
+                    ExprWithCleanups = 77,
+                    FunctionParmPackExpr = 78,
+                    GNUNullExpr = 79,
+                    GenericSelectionExpr = 80,
+                    ImaginaryLiteral = 81,
+                    ImplicitValueInitExpr = 82,
+                    InitListExpr = 83,
+                    IntegerLiteral = 84,
+                    LambdaExpr = 85,
+                    MSPropertyRefExpr = 86,
+                    MSPropertySubscriptExpr = 87,
+                    MaterializeTemporaryExpr = 88,
+                    MemberExpr = 89,
+                    NoInitExpr = 90,
+                    OffsetOfExpr = 107,
+                    OpaqueValueExpr = 108,
+                    UnresolvedLookupExpr = 109,
+                    UnresolvedMemberExpr = 110,
+                    PackExpansionExpr = 111,
+                    ParenExpr = 112,
+                    ParenListExpr = 113,
+                    PredefinedExpr = 114,
+                    PseudoObjectExpr = 115,
+                    ShuffleVectorExpr = 116,
+                    SizeOfPackExpr = 117,
+                    StmtExpr = 118,
+                    StringLiteral = 119,
+                    SubstNonTypeTemplateParmExpr = 120,
+                    SubstNonTypeTemplateParmPackExpr = 121,
+                    TypeTraitExpr = 122,
+                    TypoExpr = 123,
+                    UnaryExprOrTypeTraitExpr = 124,
+                    UnaryOperator = 125,
+                    VAArgExpr = 126,
+                    ForStmt = 127,
+                    GotoStmt = 128,
+                    IfStmt = 129,
+                    IndirectGotoStmt = 130,
+                    LabelStmt = 131,
+                    MSDependentExistsStmt = 132,
+                    NullStmt = 133,
+                    ReturnStmt = 188,
+                    SEHExceptStmt = 189,
+                    SEHFinallyStmt = 190,
+                    SEHLeaveStmt = 191,
+                    SEHTryStmt = 192,
+                    CaseStmt = 193,
+                    DefaultStmt = 194,
+                    SwitchStmt = 195,
+                    WhileStmt = 196
+                };
+
                 property ::CppSharp::CppParser::AST::Stmt* NativePtr;
                 property System::IntPtr __Instance
                 {
@@ -209,16 +208,16 @@ namespace CppSharp
                 static Stmt^ __CreateInstance(::System::IntPtr native);
                 Stmt();
 
-                Stmt(CppSharp::Parser::AST::StmtClass klass);
+                Stmt(CppSharp::Parser::AST::Stmt::StmtClass klass);
 
                 Stmt(CppSharp::Parser::AST::Stmt^ _0);
 
                 ~Stmt();
 
-                property CppSharp::Parser::AST::StmtClass StmtClass
+                property CppSharp::Parser::AST::Stmt::StmtClass stmtClass
                 {
-                    CppSharp::Parser::AST::StmtClass get();
-                    void set(CppSharp::Parser::AST::StmtClass);
+                    CppSharp::Parser::AST::Stmt::StmtClass get();
+                    void set(CppSharp::Parser::AST::Stmt::StmtClass);
                 }
 
                 property CppSharp::Parser::SourceRange^ SourceRange
@@ -227,6 +226,12 @@ namespace CppSharp
                     void set(CppSharp::Parser::SourceRange^);
                 }
 
+                property CppSharp::Parser::SourceLocation BeginLoc
+                {
+                    CppSharp::Parser::SourceLocation get();
+                    void set(CppSharp::Parser::SourceLocation);
+                }
+
                 property CppSharp::Parser::SourceLocation EndLoc
                 {
                     CppSharp::Parser::SourceLocation get();
@@ -239,7 +244,7 @@ namespace CppSharp
                     void set(CppSharp::Parser::AST::Stmt^);
                 }
 
-                static operator CppSharp::Parser::AST::Stmt^(CppSharp::Parser::AST::StmtClass klass);
+                static operator CppSharp::Parser::AST::Stmt^(CppSharp::Parser::AST::Stmt::StmtClass klass);
 
             protected:
                 bool __ownsNativeInstance;
@@ -386,7 +391,7 @@ namespace CppSharp
                 static SwitchCase^ __CreateInstance(::System::IntPtr native);
                 SwitchCase();
 
-                SwitchCase(CppSharp::Parser::AST::StmtClass klass);
+                SwitchCase(CppSharp::Parser::AST::Stmt::StmtClass klass);
 
                 SwitchCase(CppSharp::Parser::AST::SwitchCase^ _0);
 
@@ -410,7 +415,7 @@ namespace CppSharp
                     void set(CppSharp::Parser::AST::Stmt^);
                 }
 
-                static operator CppSharp::Parser::AST::SwitchCase^(CppSharp::Parser::AST::StmtClass klass);
+                static operator CppSharp::Parser::AST::SwitchCase^(CppSharp::Parser::AST::Stmt::StmtClass klass);
             };
 
             public ref class CaseStmt : CppSharp::Parser::AST::SwitchCase
@@ -951,7 +956,7 @@ namespace CppSharp
                 static AsmStmt^ __CreateInstance(::System::IntPtr native);
                 AsmStmt();
 
-                AsmStmt(CppSharp::Parser::AST::StmtClass klass);
+                AsmStmt(CppSharp::Parser::AST::Stmt::StmtClass klass);
 
                 AsmStmt(CppSharp::Parser::AST::AsmStmt^ _0);
 
@@ -1033,7 +1038,7 @@ namespace CppSharp
 
                 void Clearoutputs();
 
-                static operator CppSharp::Parser::AST::AsmStmt^(CppSharp::Parser::AST::StmtClass klass);
+                static operator CppSharp::Parser::AST::AsmStmt^(CppSharp::Parser::AST::Stmt::StmtClass klass);
             };
 
             public ref class GCCAsmStmt : CppSharp::Parser::AST::AsmStmt
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
index 6008ebe7f6..c571c45659 100644
--- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
@@ -17335,151 +17335,24 @@ namespace Parser
     {
         namespace AST
         {
-            public enum StmtClass
-            {
-                NoStmt = 0,
-                GCCAsmStmt = 1,
-                MSAsmStmt = 2,
-                AttributedStmt = 3,
-                BreakStmt = 4,
-                CXXCatchStmt = 5,
-                CXXForRangeStmt = 6,
-                CXXTryStmt = 7,
-                CapturedStmt = 8,
-                CompoundStmt = 9,
-                ContinueStmt = 10,
-                CoreturnStmt = 11,
-                CoroutineBodyStmt = 12,
-                DeclStmt = 13,
-                DoStmt = 14,
-                BinaryConditionalOperator = 15,
-                ConditionalOperator = 16,
-                AddrLabelExpr = 17,
-                ArrayInitIndexExpr = 18,
-                ArrayInitLoopExpr = 19,
-                ArraySubscriptExpr = 20,
-                ArrayTypeTraitExpr = 21,
-                AsTypeExpr = 22,
-                AtomicExpr = 23,
-                BinaryOperator = 24,
-                CompoundAssignOperator = 25,
-                BlockExpr = 26,
-                CXXBindTemporaryExpr = 27,
-                CXXBoolLiteralExpr = 28,
-                CXXConstructExpr = 29,
-                CXXTemporaryObjectExpr = 30,
-                CXXDefaultArgExpr = 31,
-                CXXDefaultInitExpr = 32,
-                CXXDeleteExpr = 33,
-                CXXDependentScopeMemberExpr = 34,
-                CXXFoldExpr = 35,
-                CXXInheritedCtorInitExpr = 36,
-                CXXNewExpr = 37,
-                CXXNoexceptExpr = 38,
-                CXXNullPtrLiteralExpr = 39,
-                CXXPseudoDestructorExpr = 40,
-                CXXScalarValueInitExpr = 41,
-                CXXStdInitializerListExpr = 42,
-                CXXThisExpr = 43,
-                CXXThrowExpr = 44,
-                CXXTypeidExpr = 45,
-                CXXUnresolvedConstructExpr = 46,
-                CXXUuidofExpr = 47,
-                CallExpr = 48,
-                CUDAKernelCallExpr = 49,
-                CXXMemberCallExpr = 50,
-                CXXOperatorCallExpr = 51,
-                UserDefinedLiteral = 52,
-                CStyleCastExpr = 53,
-                CXXFunctionalCastExpr = 54,
-                CXXConstCastExpr = 55,
-                CXXDynamicCastExpr = 56,
-                CXXReinterpretCastExpr = 57,
-                CXXStaticCastExpr = 58,
-                ImplicitCastExpr = 60,
-                CharacterLiteral = 61,
-                ChooseExpr = 62,
-                CompoundLiteralExpr = 63,
-                ConvertVectorExpr = 64,
-                CoawaitExpr = 65,
-                CoyieldExpr = 66,
-                DeclRefExpr = 67,
-                DependentCoawaitExpr = 68,
-                DependentScopeDeclRefExpr = 69,
-                DesignatedInitExpr = 70,
-                DesignatedInitUpdateExpr = 71,
-                ExpressionTraitExpr = 72,
-                ExtVectorElementExpr = 73,
-                FixedPointLiteral = 74,
-                FloatingLiteral = 75,
-                ConstantExpr = 76,
-                ExprWithCleanups = 77,
-                FunctionParmPackExpr = 78,
-                GNUNullExpr = 79,
-                GenericSelectionExpr = 80,
-                ImaginaryLiteral = 81,
-                ImplicitValueInitExpr = 82,
-                InitListExpr = 83,
-                IntegerLiteral = 84,
-                LambdaExpr = 85,
-                MSPropertyRefExpr = 86,
-                MSPropertySubscriptExpr = 87,
-                MaterializeTemporaryExpr = 88,
-                MemberExpr = 89,
-                NoInitExpr = 90,
-                OffsetOfExpr = 107,
-                OpaqueValueExpr = 108,
-                UnresolvedLookupExpr = 109,
-                UnresolvedMemberExpr = 110,
-                PackExpansionExpr = 111,
-                ParenExpr = 112,
-                ParenListExpr = 113,
-                PredefinedExpr = 114,
-                PseudoObjectExpr = 115,
-                ShuffleVectorExpr = 116,
-                SizeOfPackExpr = 117,
-                StmtExpr = 118,
-                StringLiteral = 119,
-                SubstNonTypeTemplateParmExpr = 120,
-                SubstNonTypeTemplateParmPackExpr = 121,
-                TypeTraitExpr = 122,
-                TypoExpr = 123,
-                UnaryExprOrTypeTraitExpr = 124,
-                UnaryOperator = 125,
-                VAArgExpr = 126,
-                ForStmt = 127,
-                GotoStmt = 128,
-                IfStmt = 129,
-                IndirectGotoStmt = 130,
-                LabelStmt = 131,
-                MSDependentExistsStmt = 132,
-                NullStmt = 133,
-                ReturnStmt = 188,
-                SEHExceptStmt = 189,
-                SEHFinallyStmt = 190,
-                SEHLeaveStmt = 191,
-                SEHTryStmt = 192,
-                CaseStmt = 193,
-                DefaultStmt = 194,
-                SwitchStmt = 195,
-                WhileStmt = 196
-            }
-
             public unsafe partial class Stmt : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 20)]
+                [StructLayout(LayoutKind.Explicit, Size = 24)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+
+                    [FieldOffset(20)]
                     internal global::System.IntPtr stripLabelLikeStatements;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17489,8 +17362,8 @@ public partial struct __Internal
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST4StmtC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST4StmtC2ENS2_9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -17498,6 +17371,136 @@ public partial struct __Internal
                     internal static extern void cctor(global::System.IntPtr __instance, global::System.IntPtr _0);
                 }
 
+                public enum StmtClass
+                {
+                    NoStmt = 0,
+                    GCCAsmStmt = 1,
+                    MSAsmStmt = 2,
+                    AttributedStmt = 3,
+                    BreakStmt = 4,
+                    CXXCatchStmt = 5,
+                    CXXForRangeStmt = 6,
+                    CXXTryStmt = 7,
+                    CapturedStmt = 8,
+                    CompoundStmt = 9,
+                    ContinueStmt = 10,
+                    CoreturnStmt = 11,
+                    CoroutineBodyStmt = 12,
+                    DeclStmt = 13,
+                    DoStmt = 14,
+                    BinaryConditionalOperator = 15,
+                    ConditionalOperator = 16,
+                    AddrLabelExpr = 17,
+                    ArrayInitIndexExpr = 18,
+                    ArrayInitLoopExpr = 19,
+                    ArraySubscriptExpr = 20,
+                    ArrayTypeTraitExpr = 21,
+                    AsTypeExpr = 22,
+                    AtomicExpr = 23,
+                    BinaryOperator = 24,
+                    CompoundAssignOperator = 25,
+                    BlockExpr = 26,
+                    CXXBindTemporaryExpr = 27,
+                    CXXBoolLiteralExpr = 28,
+                    CXXConstructExpr = 29,
+                    CXXTemporaryObjectExpr = 30,
+                    CXXDefaultArgExpr = 31,
+                    CXXDefaultInitExpr = 32,
+                    CXXDeleteExpr = 33,
+                    CXXDependentScopeMemberExpr = 34,
+                    CXXFoldExpr = 35,
+                    CXXInheritedCtorInitExpr = 36,
+                    CXXNewExpr = 37,
+                    CXXNoexceptExpr = 38,
+                    CXXNullPtrLiteralExpr = 39,
+                    CXXPseudoDestructorExpr = 40,
+                    CXXScalarValueInitExpr = 41,
+                    CXXStdInitializerListExpr = 42,
+                    CXXThisExpr = 43,
+                    CXXThrowExpr = 44,
+                    CXXTypeidExpr = 45,
+                    CXXUnresolvedConstructExpr = 46,
+                    CXXUuidofExpr = 47,
+                    CallExpr = 48,
+                    CUDAKernelCallExpr = 49,
+                    CXXMemberCallExpr = 50,
+                    CXXOperatorCallExpr = 51,
+                    UserDefinedLiteral = 52,
+                    CStyleCastExpr = 53,
+                    CXXFunctionalCastExpr = 54,
+                    CXXConstCastExpr = 55,
+                    CXXDynamicCastExpr = 56,
+                    CXXReinterpretCastExpr = 57,
+                    CXXStaticCastExpr = 58,
+                    ImplicitCastExpr = 60,
+                    CharacterLiteral = 61,
+                    ChooseExpr = 62,
+                    CompoundLiteralExpr = 63,
+                    ConvertVectorExpr = 64,
+                    CoawaitExpr = 65,
+                    CoyieldExpr = 66,
+                    DeclRefExpr = 67,
+                    DependentCoawaitExpr = 68,
+                    DependentScopeDeclRefExpr = 69,
+                    DesignatedInitExpr = 70,
+                    DesignatedInitUpdateExpr = 71,
+                    ExpressionTraitExpr = 72,
+                    ExtVectorElementExpr = 73,
+                    FixedPointLiteral = 74,
+                    FloatingLiteral = 75,
+                    ConstantExpr = 76,
+                    ExprWithCleanups = 77,
+                    FunctionParmPackExpr = 78,
+                    GNUNullExpr = 79,
+                    GenericSelectionExpr = 80,
+                    ImaginaryLiteral = 81,
+                    ImplicitValueInitExpr = 82,
+                    InitListExpr = 83,
+                    IntegerLiteral = 84,
+                    LambdaExpr = 85,
+                    MSPropertyRefExpr = 86,
+                    MSPropertySubscriptExpr = 87,
+                    MaterializeTemporaryExpr = 88,
+                    MemberExpr = 89,
+                    NoInitExpr = 90,
+                    OffsetOfExpr = 107,
+                    OpaqueValueExpr = 108,
+                    UnresolvedLookupExpr = 109,
+                    UnresolvedMemberExpr = 110,
+                    PackExpansionExpr = 111,
+                    ParenExpr = 112,
+                    ParenListExpr = 113,
+                    PredefinedExpr = 114,
+                    PseudoObjectExpr = 115,
+                    ShuffleVectorExpr = 116,
+                    SizeOfPackExpr = 117,
+                    StmtExpr = 118,
+                    StringLiteral = 119,
+                    SubstNonTypeTemplateParmExpr = 120,
+                    SubstNonTypeTemplateParmPackExpr = 121,
+                    TypeTraitExpr = 122,
+                    TypoExpr = 123,
+                    UnaryExprOrTypeTraitExpr = 124,
+                    UnaryOperator = 125,
+                    VAArgExpr = 126,
+                    ForStmt = 127,
+                    GotoStmt = 128,
+                    IfStmt = 129,
+                    IndirectGotoStmt = 130,
+                    LabelStmt = 131,
+                    MSDependentExistsStmt = 132,
+                    NullStmt = 133,
+                    ReturnStmt = 188,
+                    SEHExceptStmt = 189,
+                    SEHFinallyStmt = 190,
+                    SEHLeaveStmt = 191,
+                    SEHTryStmt = 192,
+                    CaseStmt = 193,
+                    DefaultStmt = 194,
+                    SwitchStmt = 195,
+                    WhileStmt = 196
+                }
+
                 public global::System.IntPtr __Instance { get; protected set; }
 
                 protected int __PointerAdjustment;
@@ -17545,7 +17548,7 @@ public Stmt()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public Stmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public Stmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.Stmt.__Internal));
                     __ownsNativeInstance = true;
@@ -17577,12 +17580,12 @@ public virtual void Dispose(bool disposing)
                     __Instance = IntPtr.Zero;
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.Stmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.Stmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.Stmt(klass);
                 }
 
-                public global::CppSharp.Parser.AST.StmtClass StmtClass
+                public global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass
                 {
                     get
                     {
@@ -17608,6 +17611,19 @@ public virtual void Dispose(bool disposing)
                     }
                 }
 
+                public global::CppSharp.Parser.SourceLocation BeginLoc
+                {
+                    get
+                    {
+                        return global::CppSharp.Parser.SourceLocation.__CreateInstance(((global::CppSharp.Parser.AST.Stmt.__Internal*) __Instance)->beginLoc);
+                    }
+
+                    set
+                    {
+                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->beginLoc = value.__Instance;
+                    }
+                }
+
                 public global::CppSharp.Parser.SourceLocation EndLoc
                 {
                     get
@@ -17642,28 +17658,31 @@ public virtual void Dispose(bool disposing)
 
             public unsafe partial class DeclStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 44)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_allocator__S0_ decls;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal byte isSingleDecl;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr singleDecl;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17836,25 +17855,28 @@ public uint GetdeclsCount
 
             public unsafe partial class NullStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 28)]
+                [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal semiLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal semiLoc;
+
+                    [FieldOffset(28)]
                     internal byte hasLeadingEmptyMacro;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17948,40 +17970,43 @@ public bool HasLeadingEmptyMacro
 
             public unsafe partial class CompoundStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_N___1_S_allocator__S0_ body;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal byte body_empty;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal uint size;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal global::System.IntPtr body_front;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr body_back;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBracLoc;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18211,28 +18236,31 @@ public uint GetbodyCount
 
             public unsafe partial class SwitchCase : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
                     [FieldOffset(28)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
+
+                    [FieldOffset(32)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18242,8 +18270,8 @@ public unsafe partial class SwitchCase : global::CppSharp.Parser.AST.Stmt, IDisp
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST10SwitchCaseC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST10SwitchCaseC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -18293,7 +18321,7 @@ public SwitchCase()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public SwitchCase(global::CppSharp.Parser.AST.StmtClass klass)
+                public SwitchCase(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.SwitchCase.__Internal));
@@ -18311,7 +18339,7 @@ public SwitchCase(global::CppSharp.Parser.AST.SwitchCase _0)
                     *((global::CppSharp.Parser.AST.SwitchCase.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.SwitchCase.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.SwitchCase(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.SwitchCase(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.SwitchCase(klass);
                 }
@@ -18363,43 +18391,46 @@ public SwitchCase(global::CppSharp.Parser.AST.SwitchCase _0)
 
             public unsafe partial class CaseStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 52)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr subStmt;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
                     [FieldOffset(32)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal caseLoc;
+                    internal global::System.IntPtr subStmt;
 
                     [FieldOffset(36)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal caseLoc;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr lHS;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
                     [FieldOffset(44)]
-                    internal global::System.IntPtr rHS;
+                    internal global::System.IntPtr lHS;
 
                     [FieldOffset(48)]
+                    internal global::System.IntPtr rHS;
+
+                    [FieldOffset(52)]
                     internal byte caseStmtIsGNURange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18542,31 +18573,34 @@ public bool CaseStmtIsGNURange
 
             public unsafe partial class DefaultStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 36)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr subStmt;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
                     [FieldOffset(32)]
+                    internal global::System.IntPtr subStmt;
+
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal defaultLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18647,28 +18681,31 @@ public DefaultStmt(global::CppSharp.Parser.AST.DefaultStmt _0)
 
             public unsafe partial class LabelStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal identLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr subStmt;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal identLoc;
 
                     [FieldOffset(28)]
+                    internal global::System.IntPtr subStmt;
+
+                    [FieldOffset(32)]
                     internal global::System.IntPtr name;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18780,25 +18817,28 @@ public string Name
 
             public unsafe partial class AttributedStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 28)]
+                [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal attrLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal attrLoc;
+
+                    [FieldOffset(28)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18897,55 +18937,58 @@ public AttributedStmt(global::CppSharp.Parser.AST.AttributedStmt _0)
 
             public unsafe partial class IfStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr then;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr _else;
+                    internal global::System.IntPtr then;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr _else;
 
                     [FieldOffset(36)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal ifLoc;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(40)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal elseLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal ifLoc;
 
                     [FieldOffset(44)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal elseLoc;
+
+                    [FieldOffset(48)]
                     internal byte _constexpr;
 
-                    [FieldOffset(45)]
+                    [FieldOffset(49)]
                     internal byte hasInitStorage;
 
-                    [FieldOffset(46)]
+                    [FieldOffset(50)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(47)]
+                    [FieldOffset(51)]
                     internal byte hasElseStorage;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte isObjCAvailabilityCheck;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19194,43 +19237,46 @@ public bool IsObjCAvailabilityCheck
 
             public unsafe partial class SwitchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 52)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(32)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal switchLoc;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(36)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal switchLoc;
+
+                    [FieldOffset(40)]
                     internal byte hasInitStorage;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal byte isAllEnumCasesCovered;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19422,34 +19468,37 @@ public bool IsAllEnumCasesCovered
 
             public unsafe partial class WhileStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 44)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(28)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(32)]
-                    internal byte hasVarStorage;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
 
                     [FieldOffset(36)]
+                    internal byte hasVarStorage;
+
+                    [FieldOffset(40)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19597,34 +19646,37 @@ public bool HasVarStorage
 
             public unsafe partial class DoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 44)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(28)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal doLoc;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(32)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal doLoc;
 
                     [FieldOffset(36)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
+
+                    [FieldOffset(40)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19767,43 +19819,46 @@ public DoStmt(global::CppSharp.Parser.AST.DoStmt _0)
 
             public unsafe partial class ForStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 52)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr inc;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr inc;
 
                     [FieldOffset(36)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(40)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
 
                     [FieldOffset(44)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
                     [FieldOffset(48)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
+
+                    [FieldOffset(52)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20000,25 +20055,28 @@ public ForStmt(global::CppSharp.Parser.AST.ForStmt _0)
 
             public unsafe partial class GotoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 28)]
+                [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
+
+                    [FieldOffset(28)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal labelLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20112,28 +20170,31 @@ public GotoStmt(global::CppSharp.Parser.AST.GotoStmt _0)
 
             public unsafe partial class IndirectGotoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal starLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
 
                     [FieldOffset(28)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal starLoc;
+
+                    [FieldOffset(32)]
                     internal global::System.IntPtr target;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20245,22 +20306,25 @@ public IndirectGotoStmt(global::CppSharp.Parser.AST.IndirectGotoStmt _0)
 
             public unsafe partial class ContinueStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 28)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal continueLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20341,22 +20405,25 @@ public ContinueStmt(global::CppSharp.Parser.AST.ContinueStmt _0)
 
             public unsafe partial class BreakStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 28)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal breakLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20437,25 +20504,28 @@ public BreakStmt(global::CppSharp.Parser.AST.BreakStmt _0)
 
             public unsafe partial class ReturnStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 28)]
+                [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::System.IntPtr retValue;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr retValue;
+
+                    [FieldOffset(28)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal returnLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20554,46 +20624,49 @@ public ReturnStmt(global::CppSharp.Parser.AST.ReturnStmt _0)
 
             public unsafe partial class AsmStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ inputs;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ outputs;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal byte simple;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(53)]
                     internal byte _volatile;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal uint numOutputs;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal uint numInputs;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint numClobbers;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20603,8 +20676,8 @@ public unsafe partial class AsmStmt : global::CppSharp.Parser.AST.Stmt, IDisposa
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST7AsmStmtC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST7AsmStmtC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -20699,7 +20772,7 @@ public AsmStmt()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public AsmStmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public AsmStmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.AsmStmt.__Internal));
@@ -20781,7 +20854,7 @@ public void Clearoutputs()
                     __Internal.Clearoutputs((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.AsmStmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.AsmStmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.AsmStmt(klass);
                 }
@@ -20898,49 +20971,52 @@ public uint GetoutputsCount
 
             public unsafe partial class GCCAsmStmt : global::CppSharp.Parser.AST.AsmStmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ inputs;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ outputs;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal byte simple;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(53)]
                     internal byte _volatile;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal uint numOutputs;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal uint numInputs;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint numClobbers;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21229,58 +21305,61 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class MSAsmStmt : global::CppSharp.Parser.AST.AsmStmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 92)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ inputs;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ outputs;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal byte simple;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(53)]
                     internal byte _volatile;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal uint numOutputs;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal uint numInputs;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint numClobbers;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBraceLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal byte hasBraces;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal uint numAsmToks;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C asmString;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21424,28 +21503,31 @@ public string AsmString
 
             public unsafe partial class SEHExceptStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal exceptLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr filterExpr;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal exceptLoc;
 
                     [FieldOffset(28)]
+                    internal global::System.IntPtr filterExpr;
+
+                    [FieldOffset(32)]
                     internal global::System.IntPtr block;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21562,25 +21644,28 @@ public SEHExceptStmt(global::CppSharp.Parser.AST.SEHExceptStmt _0)
 
             public unsafe partial class SEHFinallyStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 28)]
+                [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal finallyLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal finallyLoc;
+
+                    [FieldOffset(28)]
                     internal global::System.IntPtr block;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21679,37 +21764,40 @@ public SEHFinallyStmt(global::CppSharp.Parser.AST.SEHFinallyStmt _0)
 
             public unsafe partial class SEHTryStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 44)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal byte isCXXTry;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr tryBlock;
+                    internal byte isCXXTry;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr handler;
+                    internal global::System.IntPtr tryBlock;
 
                     [FieldOffset(36)]
-                    internal global::System.IntPtr exceptHandler;
+                    internal global::System.IntPtr handler;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr exceptHandler;
+
+                    [FieldOffset(44)]
                     internal global::System.IntPtr finallyHandler;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21875,22 +21963,25 @@ public bool IsCXXTry
 
             public unsafe partial class SEHLeaveStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 28)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal leaveLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21971,28 +22062,31 @@ public SEHLeaveStmt(global::CppSharp.Parser.AST.SEHLeaveStmt _0)
 
             public unsafe partial class CapturedStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 44)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ capture_inits;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::System.IntPtr capturedStmt;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal uint capture_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22357,28 +22451,31 @@ public uint GetcaptureInitsCount
 
             public unsafe partial class CXXCatchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 36)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal catchLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal catchLoc;
+
+                    [FieldOffset(28)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal caughtType;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::System.IntPtr handlerBlock;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22490,28 +22587,31 @@ public CXXCatchStmt(global::CppSharp.Parser.AST.CXXCatchStmt _0)
 
             public unsafe partial class CXXTryStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr tryBlock;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
 
                     [FieldOffset(28)]
+                    internal global::System.IntPtr tryBlock;
+
+                    [FieldOffset(32)]
                     internal uint numHandlers;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22623,58 +22723,61 @@ public uint NumHandlers
 
             public unsafe partial class CXXForRangeStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr rangeInit;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr rangeInit;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr inc;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(36)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr inc;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr rangeStmt;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(44)]
-                    internal global::System.IntPtr beginStmt;
+                    internal global::System.IntPtr rangeStmt;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr endStmt;
+                    internal global::System.IntPtr beginStmt;
 
                     [FieldOffset(52)]
-                    internal global::System.IntPtr loopVarStmt;
+                    internal global::System.IntPtr endStmt;
 
                     [FieldOffset(56)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
+                    internal global::System.IntPtr loopVarStmt;
 
                     [FieldOffset(60)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal coawaitLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
 
                     [FieldOffset(64)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal coawaitLoc;
 
                     [FieldOffset(68)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
+
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22956,31 +23059,34 @@ public CXXForRangeStmt(global::CppSharp.Parser.AST.CXXForRangeStmt _0)
 
             public unsafe partial class MSDependentExistsStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
+
+                    [FieldOffset(28)]
                     internal byte isIfExists;
 
-                    [FieldOffset(25)]
+                    [FieldOffset(29)]
                     internal byte isIfNotExists;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23105,58 +23211,61 @@ public bool IsIfNotExists
 
             public unsafe partial class CoroutineBodyStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal byte hasDependentPromiseType;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr body;
+                    internal byte hasDependentPromiseType;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr promiseDeclStmt;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr initSuspendStmt;
+                    internal global::System.IntPtr promiseDeclStmt;
 
                     [FieldOffset(36)]
-                    internal global::System.IntPtr finalSuspendStmt;
+                    internal global::System.IntPtr initSuspendStmt;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr exceptionHandler;
+                    internal global::System.IntPtr finalSuspendStmt;
 
                     [FieldOffset(44)]
-                    internal global::System.IntPtr fallthroughHandler;
+                    internal global::System.IntPtr exceptionHandler;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr allocate;
+                    internal global::System.IntPtr fallthroughHandler;
 
                     [FieldOffset(52)]
-                    internal global::System.IntPtr deallocate;
+                    internal global::System.IntPtr allocate;
 
                     [FieldOffset(56)]
-                    internal global::System.IntPtr returnValueInit;
+                    internal global::System.IntPtr deallocate;
 
                     [FieldOffset(60)]
-                    internal global::System.IntPtr resultDecl;
+                    internal global::System.IntPtr returnValueInit;
 
                     [FieldOffset(64)]
-                    internal global::System.IntPtr returnStmt;
+                    internal global::System.IntPtr resultDecl;
 
                     [FieldOffset(68)]
+                    internal global::System.IntPtr returnStmt;
+
+                    [FieldOffset(72)]
                     internal global::System.IntPtr returnStmtOnAllocFailure;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23558,31 +23667,34 @@ public bool HasDependentPromiseType
 
             public unsafe partial class CoreturnStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 36)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal byte isImplicit;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
+                    internal byte isImplicit;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr operand;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
                     [FieldOffset(32)]
+                    internal global::System.IntPtr operand;
+
+                    [FieldOffset(36)]
                     internal global::System.IntPtr promiseCall;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23912,61 +24024,64 @@ public enum UnaryExprOrTypeTrait
 
             public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23976,8 +24091,8 @@ public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST4ExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST4ExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -24338,7 +24453,7 @@ public Expr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public Expr(global::CppSharp.Parser.AST.StmtClass klass)
+                public Expr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.Expr.__Internal));
@@ -24356,7 +24471,7 @@ public Expr(global::CppSharp.Parser.AST.Expr _0)
                     *((global::CppSharp.Parser.AST.Expr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.Expr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.Expr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.Expr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.Expr(klass);
                 }
@@ -24556,64 +24671,67 @@ public bool HasPlaceholderType
 
             public unsafe partial class FullExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -24623,8 +24741,8 @@ public unsafe partial class FullExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST8FullExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST8FullExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -24674,7 +24792,7 @@ public FullExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public FullExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public FullExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.FullExpr.__Internal));
@@ -24692,7 +24810,7 @@ public FullExpr(global::CppSharp.Parser.AST.FullExpr _0)
                     *((global::CppSharp.Parser.AST.FullExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.FullExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.FullExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.FullExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.FullExpr(klass);
                 }
@@ -24718,64 +24836,67 @@ public FullExpr(global::CppSharp.Parser.AST.FullExpr _0)
 
             public unsafe partial class ConstantExpr : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -24843,70 +24964,73 @@ public ConstantExpr(global::CppSharp.Parser.AST.ConstantExpr _0)
 
             public unsafe partial class OpaqueValueExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(53)]
+                    [FieldOffset(57)]
                     internal byte isUnique;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25018,97 +25142,100 @@ public bool IsUnique
 
             public unsafe partial class DeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 100)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(61)]
+                    [FieldOffset(65)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr foundDecl;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal byte hasTemplateKWAndArgsInfo;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(85)]
+                    [FieldOffset(89)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal byte refersToEnclosingVariableOrCapture;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25337,67 +25464,70 @@ public bool RefersToEnclosingVariableOrCapture
 
             public unsafe partial class IntegerLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal ulong value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25491,67 +25621,70 @@ public ulong Value
 
             public unsafe partial class FixedPointLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal ulong value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25645,70 +25778,73 @@ public ulong Value
 
             public unsafe partial class CharacterLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.AST.CharacterLiteral.CharacterKind kind;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25824,70 +25960,73 @@ public uint Value
 
             public unsafe partial class FloatingLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(53)]
+                    [FieldOffset(57)]
                     internal byte exact;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal double valueAsApproximateDouble;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25994,64 +26133,67 @@ public double ValueAsApproximateDouble
 
             public unsafe partial class ImaginaryLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26137,106 +26279,109 @@ public ImaginaryLiteral(global::CppSharp.Parser.AST.ImaginaryLiteral _0)
 
             public unsafe partial class StringLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 108)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C bytes;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint byteLength;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal uint length;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint charByteWidth;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.AST.StringLiteral.StringKind kind;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isAscii;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(101)]
                     internal byte isWide;
 
-                    [FieldOffset(98)]
+                    [FieldOffset(102)]
                     internal byte isUTF8;
 
-                    [FieldOffset(99)]
+                    [FieldOffset(103)]
                     internal byte isUTF16;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal byte isUTF32;
 
-                    [FieldOffset(101)]
+                    [FieldOffset(105)]
                     internal byte isPascal;
 
-                    [FieldOffset(102)]
+                    [FieldOffset(106)]
                     internal byte containsNonAscii;
 
-                    [FieldOffset(103)]
+                    [FieldOffset(107)]
                     internal byte containsNonAsciiOrNull;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal uint numConcatenated;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26535,67 +26680,70 @@ public uint NumConcatenated
 
             public unsafe partial class PredefinedExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.AST.PredefinedExpr.IdentKind identKind;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26701,70 +26849,73 @@ public PredefinedExpr(global::CppSharp.Parser.AST.PredefinedExpr _0)
 
             public unsafe partial class ParenExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParen;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParen;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26876,91 +27027,94 @@ public ParenExpr(global::CppSharp.Parser.AST.ParenExpr _0)
 
             public unsafe partial class UnaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 76)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.UnaryOperatorKind opcode;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal byte canOverflow;
 
-                    [FieldOffset(69)]
+                    [FieldOffset(73)]
                     internal byte isPrefix;
 
-                    [FieldOffset(70)]
+                    [FieldOffset(74)]
                     internal byte isPostfix;
 
-                    [FieldOffset(71)]
+                    [FieldOffset(75)]
                     internal byte isIncrementOp;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal byte isDecrementOp;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(77)]
                     internal byte isIncrementDecrementOp;
 
-                    [FieldOffset(74)]
+                    [FieldOffset(78)]
                     internal byte isArithmeticOp;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27163,73 +27317,76 @@ public bool IsArithmeticOp
 
             public unsafe partial class OffsetOfExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint numComponents;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal uint numExpressions;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27349,82 +27506,85 @@ public uint NumExpressions
 
             public unsafe partial class UnaryExprOrTypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 92)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.UnaryExprOrTypeTrait kind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal byte isArgumentType;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal argumentType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr argumentExpr;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeOfArgument;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27588,76 +27748,79 @@ public bool IsArgumentType
 
             public unsafe partial class ArraySubscriptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 76)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracketLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr idx;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27810,88 +27973,91 @@ public ArraySubscriptExpr(global::CppSharp.Parser.AST.ArraySubscriptExpr _0)
 
             public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 100)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal uint numArgs;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numCommas;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isCallToStdMove;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27901,8 +28067,8 @@ public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST8CallExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST8CallExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -27977,7 +28143,7 @@ public CallExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CallExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CallExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CallExpr.__Internal));
@@ -28035,7 +28201,7 @@ public void Cleararguments()
                     __Internal.Cleararguments((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CallExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CallExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CallExpr(klass);
                 }
@@ -28171,100 +28337,103 @@ public uint GetargumentsCount
 
             public unsafe partial class MemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 100)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte arrow;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(69)]
+                    [FieldOffset(73)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(85)]
+                    [FieldOffset(89)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isImplicitAccess;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28506,70 +28675,73 @@ public bool IsImplicitAccess
 
             public unsafe partial class CompoundLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr initializer;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte fileScope;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28681,82 +28853,85 @@ public bool FileScope
 
             public unsafe partial class CastExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 84)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28766,8 +28941,8 @@ public unsafe partial class CastExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST8CastExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST8CastExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -28817,7 +28992,7 @@ public CastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CastExpr.__Internal));
@@ -28835,7 +29010,7 @@ public CastExpr(global::CppSharp.Parser.AST.CastExpr _0)
                     *((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CastExpr(klass);
                 }
@@ -28949,85 +29124,88 @@ public uint PathSize
 
             public unsafe partial class ImplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte isPartOfExplicitCast;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29113,85 +29291,88 @@ public bool IsPartOfExplicitCast
 
             public unsafe partial class ExplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 92)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29201,8 +29382,8 @@ public unsafe partial class ExplicitCastExpr : global::CppSharp.Parser.AST.CastE
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST16ExplicitCastExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST16ExplicitCastExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -29252,7 +29433,7 @@ public ExplicitCastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public ExplicitCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public ExplicitCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal));
@@ -29270,7 +29451,7 @@ public ExplicitCastExpr(global::CppSharp.Parser.AST.ExplicitCastExpr _0)
                     *((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.ExplicitCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.ExplicitCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.ExplicitCastExpr(klass);
                 }
@@ -29291,91 +29472,94 @@ public ExplicitCastExpr(global::CppSharp.Parser.AST.ExplicitCastExpr _0)
 
             public unsafe partial class CStyleCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 100)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29469,118 +29653,121 @@ public CStyleCastExpr(global::CppSharp.Parser.AST.CStyleCastExpr _0)
 
             public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 100)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind opcode;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C opcodeStr;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte isPtrMemOp;
 
-                    [FieldOffset(85)]
+                    [FieldOffset(89)]
                     internal byte isMultiplicativeOp;
 
-                    [FieldOffset(86)]
+                    [FieldOffset(90)]
                     internal byte isAdditiveOp;
 
-                    [FieldOffset(87)]
+                    [FieldOffset(91)]
                     internal byte isShiftOp;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal byte isBitwiseOp;
 
-                    [FieldOffset(89)]
+                    [FieldOffset(93)]
                     internal byte isRelationalOp;
 
-                    [FieldOffset(90)]
+                    [FieldOffset(94)]
                     internal byte isEqualityOp;
 
-                    [FieldOffset(91)]
+                    [FieldOffset(95)]
                     internal byte isComparisonOp;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal byte isLogicalOp;
 
-                    [FieldOffset(93)]
+                    [FieldOffset(97)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(94)]
+                    [FieldOffset(98)]
                     internal byte isCompoundAssignmentOp;
 
-                    [FieldOffset(95)]
+                    [FieldOffset(99)]
                     internal byte isShiftAssignOp;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isFPContractableWithinStatement;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(101)]
                     internal byte isFEnvAccessOn;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29590,8 +29777,8 @@ public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, I
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST14BinaryOperatorC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST14BinaryOperatorC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -29646,7 +29833,7 @@ public BinaryOperator()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public BinaryOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public BinaryOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.BinaryOperator.__Internal));
@@ -29680,7 +29867,7 @@ public override void Dispose(bool disposing)
                     __Instance = IntPtr.Zero;
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.BinaryOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.BinaryOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.BinaryOperator(klass);
                 }
@@ -29948,124 +30135,127 @@ public bool IsFEnvAccessOn
 
             public unsafe partial class CompoundAssignOperator : global::CppSharp.Parser.AST.BinaryOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 116)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind opcode;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C opcodeStr;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte isPtrMemOp;
 
-                    [FieldOffset(85)]
+                    [FieldOffset(89)]
                     internal byte isMultiplicativeOp;
 
-                    [FieldOffset(86)]
+                    [FieldOffset(90)]
                     internal byte isAdditiveOp;
 
-                    [FieldOffset(87)]
+                    [FieldOffset(91)]
                     internal byte isShiftOp;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal byte isBitwiseOp;
 
-                    [FieldOffset(89)]
+                    [FieldOffset(93)]
                     internal byte isRelationalOp;
 
-                    [FieldOffset(90)]
+                    [FieldOffset(94)]
                     internal byte isEqualityOp;
 
-                    [FieldOffset(91)]
+                    [FieldOffset(95)]
                     internal byte isComparisonOp;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal byte isLogicalOp;
 
-                    [FieldOffset(93)]
+                    [FieldOffset(97)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(94)]
+                    [FieldOffset(98)]
                     internal byte isCompoundAssignmentOp;
 
-                    [FieldOffset(95)]
+                    [FieldOffset(99)]
                     internal byte isShiftAssignOp;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isFPContractableWithinStatement;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(101)]
                     internal byte isFEnvAccessOn;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal computationLHSType;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal computationResultType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30180,76 +30370,79 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class AbstractConditionalOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 76)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30259,8 +30452,8 @@ public unsafe partial class AbstractConditionalOperator : global::CppSharp.Parse
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST27AbstractConditionalOperatorC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST27AbstractConditionalOperatorC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -30310,7 +30503,7 @@ public AbstractConditionalOperator()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public AbstractConditionalOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public AbstractConditionalOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal));
@@ -30328,7 +30521,7 @@ public AbstractConditionalOperator(global::CppSharp.Parser.AST.AbstractCondition
                     *((global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.AbstractConditionalOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.AbstractConditionalOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.AbstractConditionalOperator(klass);
                 }
@@ -30416,82 +30609,85 @@ public AbstractConditionalOperator(global::CppSharp.Parser.AST.AbstractCondition
 
             public unsafe partial class ConditionalOperator : global::CppSharp.Parser.AST.AbstractConditionalOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 84)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr rHS;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30595,82 +30791,85 @@ public ConditionalOperator(global::CppSharp.Parser.AST.ConditionalOperator _0)
 
             public unsafe partial class BinaryConditionalOperator : global::CppSharp.Parser.AST.AbstractConditionalOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 84)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr common;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr opaqueValue;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30774,67 +30973,70 @@ public BinaryConditionalOperator(global::CppSharp.Parser.AST.BinaryConditionalOp
 
             public unsafe partial class AddrLabelExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ampAmpLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal labelLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30928,70 +31130,73 @@ public AddrLabelExpr(global::CppSharp.Parser.AST.AddrLabelExpr _0)
 
             public unsafe partial class StmtExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subStmt;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31103,70 +31308,73 @@ public StmtExpr(global::CppSharp.Parser.AST.StmtExpr _0)
 
             public unsafe partial class ShuffleVectorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint numSubExprs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31273,70 +31481,73 @@ public uint NumSubExprs
 
             public unsafe partial class ConvertVectorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr srcExpr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31448,85 +31659,88 @@ public ConvertVectorExpr(global::CppSharp.Parser.AST.ConvertVectorExpr _0)
 
             public unsafe partial class ChooseExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 84)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(53)]
+                    [FieldOffset(57)]
                     internal byte isConditionTrue;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte isConditionDependent;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr chosenSubExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31718,64 +31932,67 @@ public bool IsConditionDependent
 
             public unsafe partial class GNUNullExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tokenLocation;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31856,73 +32073,76 @@ public GNUNullExpr(global::CppSharp.Parser.AST.GNUNullExpr _0)
 
             public unsafe partial class VAArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte isMicrosoftABI;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -32047,97 +32267,100 @@ public bool IsMicrosoftABI
 
             public unsafe partial class InitListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 92)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr arrayFiller;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBraceLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBraceLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr syntacticForm;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal uint numInits;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte hasArrayFiller;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(81)]
                     internal byte isExplicit;
 
-                    [FieldOffset(78)]
+                    [FieldOffset(82)]
                     internal byte isStringLiteralInit;
 
-                    [FieldOffset(79)]
+                    [FieldOffset(83)]
                     internal byte isTransparent;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal byte isSemanticForm;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr semanticForm;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal byte isSyntacticForm;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -32376,79 +32599,82 @@ public bool IsSyntacticForm
 
             public unsafe partial class DesignatedInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 84)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal equalOrColonLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr init;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint size;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal byte usesGNUSyntax;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal uint numSubExprs;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceRange.__Internal designatorsSourceRange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33044,61 +33270,64 @@ public uint NumSubExprs
 
             public unsafe partial class NoInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33166,67 +33395,70 @@ public NoInitExpr(global::CppSharp.Parser.AST.NoInitExpr _0)
 
             public unsafe partial class DesignatedInitUpdateExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr updater;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33330,67 +33562,70 @@ public DesignatedInitUpdateExpr(global::CppSharp.Parser.AST.DesignatedInitUpdate
 
             public unsafe partial class ArrayInitLoopExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33494,61 +33729,64 @@ public ArrayInitLoopExpr(global::CppSharp.Parser.AST.ArrayInitLoopExpr _0)
 
             public unsafe partial class ArrayInitIndexExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33616,61 +33854,64 @@ public ArrayInitIndexExpr(global::CppSharp.Parser.AST.ArrayInitIndexExpr _0)
 
             public unsafe partial class ImplicitValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33738,70 +33979,73 @@ public ImplicitValueInitExpr(global::CppSharp.Parser.AST.ImplicitValueInitExpr _
 
             public unsafe partial class ParenListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numExprs;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33908,85 +34152,88 @@ public uint NumExprs
 
             public unsafe partial class GenericSelectionExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numAssocs;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal genericLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal defaultLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr controllingExpr;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte isResultDependent;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint resultIndex;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr resultExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34168,76 +34415,79 @@ public uint ResultIndex
 
             public unsafe partial class ExtVectorElementExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal accessorLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint numElements;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal byte containsDuplicateElements;
 
-                    [FieldOffset(69)]
+                    [FieldOffset(73)]
                     internal byte isArrow;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34375,67 +34625,70 @@ public bool IsArrow
 
             public unsafe partial class BlockExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal caretLocation;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr body;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34534,70 +34787,73 @@ public BlockExpr(global::CppSharp.Parser.AST.BlockExpr _0)
 
             public unsafe partial class AsTypeExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr srcExpr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34709,73 +34965,76 @@ public AsTypeExpr(global::CppSharp.Parser.AST.AsTypeExpr _0)
 
             public unsafe partial class PseudoObjectExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr syntacticForm;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal uint resultExprIndex;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr resultExpr;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal uint numSemanticExprs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34905,106 +35164,109 @@ public uint NumSemanticExprs
 
             public unsafe partial class AtomicExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr ptr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr order;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr scope;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr val1;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr orderFail;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr val2;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr weak;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal valueType;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.AST.AtomicExpr.AtomicOp op;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal uint numSubExprs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal byte isVolatile;
 
-                    [FieldOffset(101)]
+                    [FieldOffset(105)]
                     internal byte isCmpXChg;
 
-                    [FieldOffset(102)]
+                    [FieldOffset(106)]
                     internal byte isOpenCL;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35352,61 +35614,64 @@ public bool IsOpenCL
 
             public unsafe partial class TypoExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35474,103 +35739,106 @@ public TypoExpr(global::CppSharp.Parser.AST.TypoExpr _0)
 
             public unsafe partial class CXXOperatorCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 116)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal uint numArgs;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numCommas;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.AST.OverloadedOperatorKind _operator;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(105)]
+                    [FieldOffset(109)]
                     internal byte isInfixBinaryOp;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(116)]
                     internal byte isFPContractableWithinStatement;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35724,94 +35992,97 @@ public bool IsFPContractableWithinStatement
 
             public unsafe partial class CXXMemberCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 108)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal uint numArgs;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numCommas;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr implicitObjectArgument;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::System.IntPtr methodDecl;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35936,91 +36207,94 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CUDAKernelCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 108)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal uint numArgs;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numCommas;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr config;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36127,97 +36401,100 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CXXNamedCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36227,8 +36504,8 @@ public unsafe partial class CXXNamedCastExpr : global::CppSharp.Parser.AST.Expli
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXNamedCastExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXNamedCastExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -36278,7 +36555,7 @@ public CXXNamedCastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CXXNamedCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CXXNamedCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal));
@@ -36296,7 +36573,7 @@ public CXXNamedCastExpr(global::CppSharp.Parser.AST.CXXNamedCastExpr _0)
                     *((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CXXNamedCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CXXNamedCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CXXNamedCastExpr(klass);
                 }
@@ -36356,97 +36633,100 @@ public string CastName
 
             public unsafe partial class CXXStaticCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36514,100 +36794,103 @@ public CXXStaticCastExpr(global::CppSharp.Parser.AST.CXXStaticCastExpr _0)
 
             public unsafe partial class CXXDynamicCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 116)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(116)]
                     internal byte isAlwaysNull;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36688,97 +36971,100 @@ public bool IsAlwaysNull
 
             public unsafe partial class CXXReinterpretCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36846,97 +37132,100 @@ public CXXReinterpretCastExpr(global::CppSharp.Parser.AST.CXXReinterpretCastExpr
 
             public unsafe partial class CXXConstCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37004,97 +37293,100 @@ public CXXConstCastExpr(global::CppSharp.Parser.AST.CXXConstCastExpr _0)
 
             public unsafe partial class UserDefinedLiteral : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal uint numArgs;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numCommas;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.AST.UserDefinedLiteral.LiteralOperatorKind literalOperatorKind;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::System.IntPtr cookedLiteral;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal uDSuffixLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37237,67 +37529,70 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CXXBoolLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(53)]
+                    [FieldOffset(57)]
                     internal byte value;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37391,64 +37686,67 @@ public bool Value
 
             public unsafe partial class CXXNullPtrLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37529,64 +37827,67 @@ public CXXNullPtrLiteralExpr(global::CppSharp.Parser.AST.CXXNullPtrLiteralExpr _
 
             public unsafe partial class CXXStdInitializerListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37672,70 +37973,73 @@ public CXXStdInitializerListExpr(global::CppSharp.Parser.AST.CXXStdInitializerLi
 
             public unsafe partial class CXXTypeidExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr exprOperand;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte isPotentiallyEvaluated;
 
-                    [FieldOffset(61)]
+                    [FieldOffset(65)]
                     internal byte isTypeOperand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37847,73 +38151,76 @@ public bool IsTypeOperand
 
             public unsafe partial class MSPropertyRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(53)]
+                    [FieldOffset(57)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr baseExpr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte isArrow;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38038,70 +38345,73 @@ public bool IsArrow
 
             public unsafe partial class MSPropertySubscriptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracketLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr idx;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38218,70 +38528,73 @@ public MSPropertySubscriptExpr(global::CppSharp.Parser.AST.MSPropertySubscriptEx
 
             public unsafe partial class CXXUuidofExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 76)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr exprOperand;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C uuidStr;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal byte isTypeOperand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38417,67 +38730,70 @@ public bool IsTypeOperand
 
             public unsafe partial class CXXThisExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte @implicit;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38571,70 +38887,73 @@ public bool Implicit
 
             public unsafe partial class CXXThrowExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal throwLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal byte isThrownVariableInScope;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38746,67 +39065,70 @@ public bool IsThrownVariableInScope
 
             public unsafe partial class CXXDefaultArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr expr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal usedLocation;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38905,67 +39227,70 @@ public CXXDefaultArgExpr(global::CppSharp.Parser.AST.CXXDefaultArgExpr _0)
 
             public unsafe partial class CXXDefaultInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr field;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr expr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39069,64 +39394,67 @@ public CXXDefaultInitExpr(global::CppSharp.Parser.AST.CXXDefaultInitExpr _0)
 
             public unsafe partial class CXXBindTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39212,88 +39540,91 @@ public CXXBindTemporaryExpr(global::CppSharp.Parser.AST.CXXBindTemporaryExpr _0)
 
             public unsafe partial class CXXConstructExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 92)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal byte elidable;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(77)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(74)]
+                    [FieldOffset(78)]
                     internal byte listInitialization;
 
-                    [FieldOffset(75)]
+                    [FieldOffset(79)]
                     internal byte stdInitListInitialization;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte requiresZeroInitialization;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceRange.__Internal parenOrBraceRange;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39303,8 +39634,8 @@ public unsafe partial class CXXConstructExpr : global::CppSharp.Parser.AST.Expr,
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXConstructExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXConstructExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -39387,7 +39718,7 @@ public CXXConstructExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CXXConstructExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CXXConstructExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CXXConstructExpr.__Internal));
@@ -39445,7 +39776,7 @@ public void Cleararguments()
                     __Internal.Cleararguments((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CXXConstructExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CXXConstructExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CXXConstructExpr(klass);
                 }
@@ -39566,70 +39897,73 @@ public uint GetargumentsCount
 
             public unsafe partial class CXXInheritedCtorInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
-                    internal byte isOrdinaryOrBitFieldObject;
-
                     [FieldOffset(44)]
-                    internal global::System.IntPtr sourceBitField;
+                    internal byte isOrdinaryOrBitFieldObject;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr referencedDeclOfCallee;
+                    internal global::System.IntPtr sourceBitField;
 
                     [FieldOffset(52)]
+                    internal global::System.IntPtr referencedDeclOfCallee;
+
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(53)]
+                    [FieldOffset(57)]
                     internal byte constructsVBase;
 
-                    [FieldOffset(54)]
+                    [FieldOffset(58)]
                     internal byte inheritedFromVBase;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39736,94 +40070,97 @@ public bool InheritedFromVBase
 
             public unsafe partial class CXXFunctionalCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 108)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal byte isListInitialization;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39930,88 +40267,91 @@ public bool IsListInitialization
 
             public unsafe partial class CXXTemporaryObjectExpr : global::CppSharp.Parser.AST.CXXConstructExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 92)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal byte elidable;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(77)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(74)]
+                    [FieldOffset(78)]
                     internal byte listInitialization;
 
-                    [FieldOffset(75)]
+                    [FieldOffset(79)]
                     internal byte stdInitListInitialization;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte requiresZeroInitialization;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceRange.__Internal parenOrBraceRange;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40100,91 +40440,94 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class LambdaExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 100)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ capture_inits;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal captureDefaultLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal uint capture_size;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceRange.__Internal introducerRange;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr callOperator;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal byte isGenericLambda;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr body;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isMutable;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(101)]
                     internal byte hasExplicitParameters;
 
-                    [FieldOffset(98)]
+                    [FieldOffset(102)]
                     internal byte hasExplicitResultType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40453,64 +40796,67 @@ public uint GetcaptureInitsCount
 
             public unsafe partial class CXXScalarValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40591,106 +40937,109 @@ public CXXScalarValueInitExpr(global::CppSharp.Parser.AST.CXXScalarValueInitExpr
 
             public unsafe partial class CXXNewExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 132)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ placement_arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr operatorNew;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr operatorDelete;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal allocatedType;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte isArray;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal global::System.IntPtr arraySize;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal uint numPlacementArgs;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isParenTypeId;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceRange.__Internal typeIdParens;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(112)]
                     internal byte isGlobalNew;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(113)]
                     internal byte hasInitializer;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.AST.CXXNewExpr.InitializationStyle initializationStyle;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr initializer;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(124)]
                     internal global::System.IntPtr constructExpr;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceRange.__Internal directInitRange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41046,79 +41395,82 @@ public uint GetplacementArgumentsCount
 
             public unsafe partial class CXXDeleteExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(53)]
+                    [FieldOffset(57)]
                     internal byte isGlobalDelete;
 
-                    [FieldOffset(54)]
+                    [FieldOffset(58)]
                     internal byte isArrayForm;
 
-                    [FieldOffset(55)]
+                    [FieldOffset(59)]
                     internal byte isArrayFormAsWritten;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr operatorDelete;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr argument;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal destroyedType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41274,85 +41626,88 @@ public bool IsArrayFormAsWritten
 
             public unsafe partial class CXXPseudoDestructorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
-
                     [FieldOffset(36)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
+
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(61)]
+                    [FieldOffset(65)]
                     internal byte isArrow;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonColonLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tildeLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal destroyedType;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal destroyedTypeLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41529,67 +41884,70 @@ public bool IsArrow
 
             public unsafe partial class TypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(53)]
+                    [FieldOffset(57)]
                     internal byte value;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41683,70 +42041,73 @@ public uint NumArgs
 
             public unsafe partial class ArrayTypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 76)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal queriedType;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal ulong value;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr dimensionExpression;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41858,67 +42219,70 @@ public ulong Value
 
             public unsafe partial class ExpressionTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr queriedExpression;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42017,85 +42381,88 @@ public bool Value
 
             public unsafe partial class OverloadExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 84)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numDecls;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(81)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42105,8 +42472,8 @@ public unsafe partial class OverloadExpr : global::CppSharp.Parser.AST.Expr, IDi
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST12OverloadExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST12OverloadExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -42244,7 +42611,7 @@ public OverloadExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public OverloadExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public OverloadExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.OverloadExpr.__Internal));
@@ -42262,7 +42629,7 @@ public OverloadExpr(global::CppSharp.Parser.AST.OverloadExpr _0)
                     *((global::CppSharp.Parser.AST.OverloadExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.OverloadExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.OverloadExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.OverloadExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.OverloadExpr(klass);
                 }
@@ -42374,91 +42741,94 @@ public uint NumTemplateArgs
 
             public unsafe partial class UnresolvedLookupExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numDecls;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(81)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte requiresADL;
 
-                    [FieldOffset(85)]
+                    [FieldOffset(89)]
                     internal byte isOverloaded;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42552,82 +42922,85 @@ public bool IsOverloaded
 
             public unsafe partial class DependentScopeDeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(77)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42786,70 +43159,73 @@ public uint NumTemplateArgs
 
             public unsafe partial class ExprWithCleanups : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal uint numObjects;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal byte cleanupsHaveSideEffects;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42943,79 +43319,82 @@ public bool CleanupsHaveSideEffects
 
             public unsafe partial class CXXUnresolvedConstructExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 92)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte isListInitialization;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint arg_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43222,100 +43601,103 @@ public uint GetargumentsCount
 
             public unsafe partial class CXXDependentScopeMemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 108)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(53)]
+                    [FieldOffset(57)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal baseType;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal byte isArrow;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr firstQualifierFoundInScope;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(101)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43562,106 +43944,109 @@ public uint NumTemplateArgs
 
             public unsafe partial class UnresolvedMemberExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numDecls;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(81)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal baseType;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal byte hasUnresolvedUsing;
 
-                    [FieldOffset(101)]
+                    [FieldOffset(105)]
                     internal byte isArrow;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43825,67 +44210,70 @@ public bool IsArrow
 
             public unsafe partial class CXXNoexceptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43984,67 +44372,70 @@ public bool Value
 
             public unsafe partial class PackExpansionExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr pattern;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44143,79 +44534,82 @@ public PackExpansionExpr(global::CppSharp.Parser.AST.PackExpansionExpr _0)
 
             public unsafe partial class SizeOfPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal packLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr pack;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal uint packLength;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte isPartiallySubstituted;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44366,67 +44760,70 @@ public bool IsPartiallySubstituted
 
             public unsafe partial class SubstNonTypeTemplateParmExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr replacement;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44525,67 +44922,70 @@ public SubstNonTypeTemplateParmExpr(global::CppSharp.Parser.AST.SubstNonTypeTemp
 
             public unsafe partial class SubstNonTypeTemplateParmPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal parameterPackLocation;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.AST.TemplateArgument.__Internal argumentPack;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44679,67 +45079,70 @@ public SubstNonTypeTemplateParmPackExpr(global::CppSharp.Parser.AST.SubstNonType
 
             public unsafe partial class FunctionParmPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal parameterPackLocation;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal uint numExpansions;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44833,73 +45236,76 @@ public uint NumExpansions
 
             public unsafe partial class MaterializeTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr temporary;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr TemporaryExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint manglingNumber;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal byte isBoundToLvalueReference;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45117,85 +45523,88 @@ public bool IsBoundToLvalueReference
 
             public unsafe partial class CXXFoldExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 84)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal byte isRightFold;
 
-                    [FieldOffset(65)]
+                    [FieldOffset(69)]
                     internal byte isLeftFold;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr pattern;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr init;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind _operator;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45387,79 +45796,82 @@ public bool IsLeftFold
 
             public unsafe partial class CoroutineSuspendExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr resumeExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45469,8 +45881,8 @@ public unsafe partial class CoroutineSuspendExpr : global::CppSharp.Parser.AST.E
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST20CoroutineSuspendExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST20CoroutineSuspendExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -45529,7 +45941,7 @@ public CoroutineSuspendExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CoroutineSuspendExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CoroutineSuspendExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal));
@@ -45547,7 +45959,7 @@ public CoroutineSuspendExpr(global::CppSharp.Parser.AST.CoroutineSuspendExpr _0)
                     *((global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CoroutineSuspendExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CoroutineSuspendExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CoroutineSuspendExpr(klass);
                 }
@@ -45658,85 +46070,88 @@ public CoroutineSuspendExpr(global::CppSharp.Parser.AST.CoroutineSuspendExpr _0)
 
             public unsafe partial class CoawaitExpr : global::CppSharp.Parser.AST.CoroutineSuspendExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr resumeExpr;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal byte isImplicit;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr operand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45835,70 +46250,73 @@ public bool IsImplicit
 
             public unsafe partial class DependentCoawaitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr operatorCoawaitLookup;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -46015,82 +46433,85 @@ public DependentCoawaitExpr(global::CppSharp.Parser.AST.DependentCoawaitExpr _0)
 
             public unsafe partial class CoyieldExpr : global::CppSharp.Parser.AST.CoroutineSuspendExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 84)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr resumeExpr;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr operand;
 
                     [SuppressUnmanagedCodeSecurity]
diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
index ca32f43786..8c31d0bc8c 100644
--- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
@@ -17335,151 +17335,24 @@ namespace Parser
     {
         namespace AST
         {
-            public enum StmtClass
-            {
-                NoStmt = 0,
-                GCCAsmStmt = 1,
-                MSAsmStmt = 2,
-                AttributedStmt = 3,
-                BreakStmt = 4,
-                CXXCatchStmt = 5,
-                CXXForRangeStmt = 6,
-                CXXTryStmt = 7,
-                CapturedStmt = 8,
-                CompoundStmt = 9,
-                ContinueStmt = 10,
-                CoreturnStmt = 11,
-                CoroutineBodyStmt = 12,
-                DeclStmt = 13,
-                DoStmt = 14,
-                BinaryConditionalOperator = 15,
-                ConditionalOperator = 16,
-                AddrLabelExpr = 17,
-                ArrayInitIndexExpr = 18,
-                ArrayInitLoopExpr = 19,
-                ArraySubscriptExpr = 20,
-                ArrayTypeTraitExpr = 21,
-                AsTypeExpr = 22,
-                AtomicExpr = 23,
-                BinaryOperator = 24,
-                CompoundAssignOperator = 25,
-                BlockExpr = 26,
-                CXXBindTemporaryExpr = 27,
-                CXXBoolLiteralExpr = 28,
-                CXXConstructExpr = 29,
-                CXXTemporaryObjectExpr = 30,
-                CXXDefaultArgExpr = 31,
-                CXXDefaultInitExpr = 32,
-                CXXDeleteExpr = 33,
-                CXXDependentScopeMemberExpr = 34,
-                CXXFoldExpr = 35,
-                CXXInheritedCtorInitExpr = 36,
-                CXXNewExpr = 37,
-                CXXNoexceptExpr = 38,
-                CXXNullPtrLiteralExpr = 39,
-                CXXPseudoDestructorExpr = 40,
-                CXXScalarValueInitExpr = 41,
-                CXXStdInitializerListExpr = 42,
-                CXXThisExpr = 43,
-                CXXThrowExpr = 44,
-                CXXTypeidExpr = 45,
-                CXXUnresolvedConstructExpr = 46,
-                CXXUuidofExpr = 47,
-                CallExpr = 48,
-                CUDAKernelCallExpr = 49,
-                CXXMemberCallExpr = 50,
-                CXXOperatorCallExpr = 51,
-                UserDefinedLiteral = 52,
-                CStyleCastExpr = 53,
-                CXXFunctionalCastExpr = 54,
-                CXXConstCastExpr = 55,
-                CXXDynamicCastExpr = 56,
-                CXXReinterpretCastExpr = 57,
-                CXXStaticCastExpr = 58,
-                ImplicitCastExpr = 60,
-                CharacterLiteral = 61,
-                ChooseExpr = 62,
-                CompoundLiteralExpr = 63,
-                ConvertVectorExpr = 64,
-                CoawaitExpr = 65,
-                CoyieldExpr = 66,
-                DeclRefExpr = 67,
-                DependentCoawaitExpr = 68,
-                DependentScopeDeclRefExpr = 69,
-                DesignatedInitExpr = 70,
-                DesignatedInitUpdateExpr = 71,
-                ExpressionTraitExpr = 72,
-                ExtVectorElementExpr = 73,
-                FixedPointLiteral = 74,
-                FloatingLiteral = 75,
-                ConstantExpr = 76,
-                ExprWithCleanups = 77,
-                FunctionParmPackExpr = 78,
-                GNUNullExpr = 79,
-                GenericSelectionExpr = 80,
-                ImaginaryLiteral = 81,
-                ImplicitValueInitExpr = 82,
-                InitListExpr = 83,
-                IntegerLiteral = 84,
-                LambdaExpr = 85,
-                MSPropertyRefExpr = 86,
-                MSPropertySubscriptExpr = 87,
-                MaterializeTemporaryExpr = 88,
-                MemberExpr = 89,
-                NoInitExpr = 90,
-                OffsetOfExpr = 107,
-                OpaqueValueExpr = 108,
-                UnresolvedLookupExpr = 109,
-                UnresolvedMemberExpr = 110,
-                PackExpansionExpr = 111,
-                ParenExpr = 112,
-                ParenListExpr = 113,
-                PredefinedExpr = 114,
-                PseudoObjectExpr = 115,
-                ShuffleVectorExpr = 116,
-                SizeOfPackExpr = 117,
-                StmtExpr = 118,
-                StringLiteral = 119,
-                SubstNonTypeTemplateParmExpr = 120,
-                SubstNonTypeTemplateParmPackExpr = 121,
-                TypeTraitExpr = 122,
-                TypoExpr = 123,
-                UnaryExprOrTypeTraitExpr = 124,
-                UnaryOperator = 125,
-                VAArgExpr = 126,
-                ForStmt = 127,
-                GotoStmt = 128,
-                IfStmt = 129,
-                IndirectGotoStmt = 130,
-                LabelStmt = 131,
-                MSDependentExistsStmt = 132,
-                NullStmt = 133,
-                ReturnStmt = 188,
-                SEHExceptStmt = 189,
-                SEHFinallyStmt = 190,
-                SEHLeaveStmt = 191,
-                SEHTryStmt = 192,
-                CaseStmt = 193,
-                DefaultStmt = 194,
-                SwitchStmt = 195,
-                WhileStmt = 196
-            }
-
             public unsafe partial class Stmt : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 20)]
+                [StructLayout(LayoutKind.Explicit, Size = 24)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+
+                    [FieldOffset(20)]
                     internal global::System.IntPtr stripLabelLikeStatements;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17489,8 +17362,8 @@ public partial struct __Internal
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0Stmt@AST@CppParser@CppSharp@@QAE@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0Stmt@AST@CppParser@CppSharp@@QAE@W4StmtClass@0123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -17498,6 +17371,136 @@ public partial struct __Internal
                     internal static extern global::System.IntPtr cctor(global::System.IntPtr __instance, global::System.IntPtr _0);
                 }
 
+                public enum StmtClass
+                {
+                    NoStmt = 0,
+                    GCCAsmStmt = 1,
+                    MSAsmStmt = 2,
+                    AttributedStmt = 3,
+                    BreakStmt = 4,
+                    CXXCatchStmt = 5,
+                    CXXForRangeStmt = 6,
+                    CXXTryStmt = 7,
+                    CapturedStmt = 8,
+                    CompoundStmt = 9,
+                    ContinueStmt = 10,
+                    CoreturnStmt = 11,
+                    CoroutineBodyStmt = 12,
+                    DeclStmt = 13,
+                    DoStmt = 14,
+                    BinaryConditionalOperator = 15,
+                    ConditionalOperator = 16,
+                    AddrLabelExpr = 17,
+                    ArrayInitIndexExpr = 18,
+                    ArrayInitLoopExpr = 19,
+                    ArraySubscriptExpr = 20,
+                    ArrayTypeTraitExpr = 21,
+                    AsTypeExpr = 22,
+                    AtomicExpr = 23,
+                    BinaryOperator = 24,
+                    CompoundAssignOperator = 25,
+                    BlockExpr = 26,
+                    CXXBindTemporaryExpr = 27,
+                    CXXBoolLiteralExpr = 28,
+                    CXXConstructExpr = 29,
+                    CXXTemporaryObjectExpr = 30,
+                    CXXDefaultArgExpr = 31,
+                    CXXDefaultInitExpr = 32,
+                    CXXDeleteExpr = 33,
+                    CXXDependentScopeMemberExpr = 34,
+                    CXXFoldExpr = 35,
+                    CXXInheritedCtorInitExpr = 36,
+                    CXXNewExpr = 37,
+                    CXXNoexceptExpr = 38,
+                    CXXNullPtrLiteralExpr = 39,
+                    CXXPseudoDestructorExpr = 40,
+                    CXXScalarValueInitExpr = 41,
+                    CXXStdInitializerListExpr = 42,
+                    CXXThisExpr = 43,
+                    CXXThrowExpr = 44,
+                    CXXTypeidExpr = 45,
+                    CXXUnresolvedConstructExpr = 46,
+                    CXXUuidofExpr = 47,
+                    CallExpr = 48,
+                    CUDAKernelCallExpr = 49,
+                    CXXMemberCallExpr = 50,
+                    CXXOperatorCallExpr = 51,
+                    UserDefinedLiteral = 52,
+                    CStyleCastExpr = 53,
+                    CXXFunctionalCastExpr = 54,
+                    CXXConstCastExpr = 55,
+                    CXXDynamicCastExpr = 56,
+                    CXXReinterpretCastExpr = 57,
+                    CXXStaticCastExpr = 58,
+                    ImplicitCastExpr = 60,
+                    CharacterLiteral = 61,
+                    ChooseExpr = 62,
+                    CompoundLiteralExpr = 63,
+                    ConvertVectorExpr = 64,
+                    CoawaitExpr = 65,
+                    CoyieldExpr = 66,
+                    DeclRefExpr = 67,
+                    DependentCoawaitExpr = 68,
+                    DependentScopeDeclRefExpr = 69,
+                    DesignatedInitExpr = 70,
+                    DesignatedInitUpdateExpr = 71,
+                    ExpressionTraitExpr = 72,
+                    ExtVectorElementExpr = 73,
+                    FixedPointLiteral = 74,
+                    FloatingLiteral = 75,
+                    ConstantExpr = 76,
+                    ExprWithCleanups = 77,
+                    FunctionParmPackExpr = 78,
+                    GNUNullExpr = 79,
+                    GenericSelectionExpr = 80,
+                    ImaginaryLiteral = 81,
+                    ImplicitValueInitExpr = 82,
+                    InitListExpr = 83,
+                    IntegerLiteral = 84,
+                    LambdaExpr = 85,
+                    MSPropertyRefExpr = 86,
+                    MSPropertySubscriptExpr = 87,
+                    MaterializeTemporaryExpr = 88,
+                    MemberExpr = 89,
+                    NoInitExpr = 90,
+                    OffsetOfExpr = 107,
+                    OpaqueValueExpr = 108,
+                    UnresolvedLookupExpr = 109,
+                    UnresolvedMemberExpr = 110,
+                    PackExpansionExpr = 111,
+                    ParenExpr = 112,
+                    ParenListExpr = 113,
+                    PredefinedExpr = 114,
+                    PseudoObjectExpr = 115,
+                    ShuffleVectorExpr = 116,
+                    SizeOfPackExpr = 117,
+                    StmtExpr = 118,
+                    StringLiteral = 119,
+                    SubstNonTypeTemplateParmExpr = 120,
+                    SubstNonTypeTemplateParmPackExpr = 121,
+                    TypeTraitExpr = 122,
+                    TypoExpr = 123,
+                    UnaryExprOrTypeTraitExpr = 124,
+                    UnaryOperator = 125,
+                    VAArgExpr = 126,
+                    ForStmt = 127,
+                    GotoStmt = 128,
+                    IfStmt = 129,
+                    IndirectGotoStmt = 130,
+                    LabelStmt = 131,
+                    MSDependentExistsStmt = 132,
+                    NullStmt = 133,
+                    ReturnStmt = 188,
+                    SEHExceptStmt = 189,
+                    SEHFinallyStmt = 190,
+                    SEHLeaveStmt = 191,
+                    SEHTryStmt = 192,
+                    CaseStmt = 193,
+                    DefaultStmt = 194,
+                    SwitchStmt = 195,
+                    WhileStmt = 196
+                }
+
                 public global::System.IntPtr __Instance { get; protected set; }
 
                 protected int __PointerAdjustment;
@@ -17545,7 +17548,7 @@ public Stmt()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public Stmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public Stmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.Stmt.__Internal));
                     __ownsNativeInstance = true;
@@ -17577,12 +17580,12 @@ public virtual void Dispose(bool disposing)
                     __Instance = IntPtr.Zero;
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.Stmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.Stmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.Stmt(klass);
                 }
 
-                public global::CppSharp.Parser.AST.StmtClass StmtClass
+                public global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass
                 {
                     get
                     {
@@ -17608,6 +17611,19 @@ public virtual void Dispose(bool disposing)
                     }
                 }
 
+                public global::CppSharp.Parser.SourceLocation BeginLoc
+                {
+                    get
+                    {
+                        return global::CppSharp.Parser.SourceLocation.__CreateInstance(((global::CppSharp.Parser.AST.Stmt.__Internal*) __Instance)->beginLoc);
+                    }
+
+                    set
+                    {
+                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->beginLoc = value.__Instance;
+                    }
+                }
+
                 public global::CppSharp.Parser.SourceLocation EndLoc
                 {
                     get
@@ -17642,28 +17658,31 @@ public virtual void Dispose(bool disposing)
 
             public unsafe partial class DeclStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 44)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ decls;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal byte isSingleDecl;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr singleDecl;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17836,25 +17855,28 @@ public uint GetdeclsCount
 
             public unsafe partial class NullStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 28)]
+                [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal semiLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal semiLoc;
+
+                    [FieldOffset(28)]
                     internal byte hasLeadingEmptyMacro;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17948,40 +17970,43 @@ public bool HasLeadingEmptyMacro
 
             public unsafe partial class CompoundStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_S_allocator__S0_ body;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal byte body_empty;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal uint size;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal global::System.IntPtr body_front;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr body_back;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBracLoc;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18211,28 +18236,31 @@ public uint GetbodyCount
 
             public unsafe partial class SwitchCase : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
                     [FieldOffset(28)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
+
+                    [FieldOffset(32)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18242,8 +18270,8 @@ public unsafe partial class SwitchCase : global::CppSharp.Parser.AST.Stmt, IDisp
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0SwitchCase@AST@CppParser@CppSharp@@QAE@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0SwitchCase@AST@CppParser@CppSharp@@QAE@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -18293,7 +18321,7 @@ public SwitchCase()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public SwitchCase(global::CppSharp.Parser.AST.StmtClass klass)
+                public SwitchCase(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.SwitchCase.__Internal));
@@ -18311,7 +18339,7 @@ public SwitchCase(global::CppSharp.Parser.AST.SwitchCase _0)
                     *((global::CppSharp.Parser.AST.SwitchCase.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.SwitchCase.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.SwitchCase(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.SwitchCase(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.SwitchCase(klass);
                 }
@@ -18363,43 +18391,46 @@ public SwitchCase(global::CppSharp.Parser.AST.SwitchCase _0)
 
             public unsafe partial class CaseStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 52)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr subStmt;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
                     [FieldOffset(32)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal caseLoc;
+                    internal global::System.IntPtr subStmt;
 
                     [FieldOffset(36)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal caseLoc;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr lHS;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
                     [FieldOffset(44)]
-                    internal global::System.IntPtr rHS;
+                    internal global::System.IntPtr lHS;
 
                     [FieldOffset(48)]
+                    internal global::System.IntPtr rHS;
+
+                    [FieldOffset(52)]
                     internal byte caseStmtIsGNURange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18542,31 +18573,34 @@ public bool CaseStmtIsGNURange
 
             public unsafe partial class DefaultStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 36)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr subStmt;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
                     [FieldOffset(32)]
+                    internal global::System.IntPtr subStmt;
+
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal defaultLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18647,28 +18681,31 @@ public DefaultStmt(global::CppSharp.Parser.AST.DefaultStmt _0)
 
             public unsafe partial class LabelStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal identLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr subStmt;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal identLoc;
 
                     [FieldOffset(28)]
+                    internal global::System.IntPtr subStmt;
+
+                    [FieldOffset(32)]
                     internal global::System.IntPtr name;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18780,25 +18817,28 @@ public string Name
 
             public unsafe partial class AttributedStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 28)]
+                [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal attrLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal attrLoc;
+
+                    [FieldOffset(28)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18897,55 +18937,58 @@ public AttributedStmt(global::CppSharp.Parser.AST.AttributedStmt _0)
 
             public unsafe partial class IfStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr then;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr _else;
+                    internal global::System.IntPtr then;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr _else;
 
                     [FieldOffset(36)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal ifLoc;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(40)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal elseLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal ifLoc;
 
                     [FieldOffset(44)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal elseLoc;
+
+                    [FieldOffset(48)]
                     internal byte _constexpr;
 
-                    [FieldOffset(45)]
+                    [FieldOffset(49)]
                     internal byte hasInitStorage;
 
-                    [FieldOffset(46)]
+                    [FieldOffset(50)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(47)]
+                    [FieldOffset(51)]
                     internal byte hasElseStorage;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte isObjCAvailabilityCheck;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19194,43 +19237,46 @@ public bool IsObjCAvailabilityCheck
 
             public unsafe partial class SwitchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 52)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(32)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal switchLoc;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(36)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal switchLoc;
+
+                    [FieldOffset(40)]
                     internal byte hasInitStorage;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal byte isAllEnumCasesCovered;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19422,34 +19468,37 @@ public bool IsAllEnumCasesCovered
 
             public unsafe partial class WhileStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 44)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(28)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(32)]
-                    internal byte hasVarStorage;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
 
                     [FieldOffset(36)]
+                    internal byte hasVarStorage;
+
+                    [FieldOffset(40)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19597,34 +19646,37 @@ public bool HasVarStorage
 
             public unsafe partial class DoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 44)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(28)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal doLoc;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(32)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal doLoc;
 
                     [FieldOffset(36)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
+
+                    [FieldOffset(40)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19767,43 +19819,46 @@ public DoStmt(global::CppSharp.Parser.AST.DoStmt _0)
 
             public unsafe partial class ForStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 52)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr inc;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr inc;
 
                     [FieldOffset(36)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(40)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
 
                     [FieldOffset(44)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
                     [FieldOffset(48)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
+
+                    [FieldOffset(52)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20000,25 +20055,28 @@ public ForStmt(global::CppSharp.Parser.AST.ForStmt _0)
 
             public unsafe partial class GotoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 28)]
+                [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
+
+                    [FieldOffset(28)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal labelLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20112,28 +20170,31 @@ public GotoStmt(global::CppSharp.Parser.AST.GotoStmt _0)
 
             public unsafe partial class IndirectGotoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal starLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
 
                     [FieldOffset(28)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal starLoc;
+
+                    [FieldOffset(32)]
                     internal global::System.IntPtr target;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20245,22 +20306,25 @@ public IndirectGotoStmt(global::CppSharp.Parser.AST.IndirectGotoStmt _0)
 
             public unsafe partial class ContinueStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 28)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal continueLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20341,22 +20405,25 @@ public ContinueStmt(global::CppSharp.Parser.AST.ContinueStmt _0)
 
             public unsafe partial class BreakStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 28)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal breakLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20437,25 +20504,28 @@ public BreakStmt(global::CppSharp.Parser.AST.BreakStmt _0)
 
             public unsafe partial class ReturnStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 28)]
+                [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::System.IntPtr retValue;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr retValue;
+
+                    [FieldOffset(28)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal returnLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20554,46 +20624,49 @@ public ReturnStmt(global::CppSharp.Parser.AST.ReturnStmt _0)
 
             public unsafe partial class AsmStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal byte simple;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(53)]
                     internal byte _volatile;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal uint numOutputs;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal uint numInputs;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint numClobbers;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20603,8 +20676,8 @@ public unsafe partial class AsmStmt : global::CppSharp.Parser.AST.Stmt, IDisposa
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0AsmStmt@AST@CppParser@CppSharp@@QAE@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0AsmStmt@AST@CppParser@CppSharp@@QAE@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -20699,7 +20772,7 @@ public AsmStmt()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public AsmStmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public AsmStmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.AsmStmt.__Internal));
@@ -20781,7 +20854,7 @@ public void Clearoutputs()
                     __Internal.Clearoutputs((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.AsmStmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.AsmStmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.AsmStmt(klass);
                 }
@@ -20898,49 +20971,52 @@ public uint GetoutputsCount
 
             public unsafe partial class GCCAsmStmt : global::CppSharp.Parser.AST.AsmStmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal byte simple;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(53)]
                     internal byte _volatile;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal uint numOutputs;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal uint numInputs;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint numClobbers;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21229,58 +21305,61 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class MSAsmStmt : global::CppSharp.Parser.AST.AsmStmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 108)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal byte simple;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(53)]
                     internal byte _volatile;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal uint numOutputs;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal uint numInputs;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint numClobbers;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBraceLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal byte hasBraces;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal uint numAsmToks;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C asmString;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21424,28 +21503,31 @@ public string AsmString
 
             public unsafe partial class SEHExceptStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal exceptLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr filterExpr;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal exceptLoc;
 
                     [FieldOffset(28)]
+                    internal global::System.IntPtr filterExpr;
+
+                    [FieldOffset(32)]
                     internal global::System.IntPtr block;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21562,25 +21644,28 @@ public SEHExceptStmt(global::CppSharp.Parser.AST.SEHExceptStmt _0)
 
             public unsafe partial class SEHFinallyStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 28)]
+                [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal finallyLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal finallyLoc;
+
+                    [FieldOffset(28)]
                     internal global::System.IntPtr block;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21679,37 +21764,40 @@ public SEHFinallyStmt(global::CppSharp.Parser.AST.SEHFinallyStmt _0)
 
             public unsafe partial class SEHTryStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 44)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal byte isCXXTry;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr tryBlock;
+                    internal byte isCXXTry;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr handler;
+                    internal global::System.IntPtr tryBlock;
 
                     [FieldOffset(36)]
-                    internal global::System.IntPtr exceptHandler;
+                    internal global::System.IntPtr handler;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr exceptHandler;
+
+                    [FieldOffset(44)]
                     internal global::System.IntPtr finallyHandler;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21875,22 +21963,25 @@ public bool IsCXXTry
 
             public unsafe partial class SEHLeaveStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 28)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal leaveLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21971,28 +22062,31 @@ public SEHLeaveStmt(global::CppSharp.Parser.AST.SEHLeaveStmt _0)
 
             public unsafe partial class CapturedStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 44)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ capture_inits;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::System.IntPtr capturedStmt;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal uint capture_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22357,28 +22451,31 @@ public uint GetcaptureInitsCount
 
             public unsafe partial class CXXCatchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 36)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal catchLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal catchLoc;
+
+                    [FieldOffset(28)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal caughtType;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::System.IntPtr handlerBlock;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22490,28 +22587,31 @@ public CXXCatchStmt(global::CppSharp.Parser.AST.CXXCatchStmt _0)
 
             public unsafe partial class CXXTryStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr tryBlock;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
 
                     [FieldOffset(28)]
+                    internal global::System.IntPtr tryBlock;
+
+                    [FieldOffset(32)]
                     internal uint numHandlers;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22623,58 +22723,61 @@ public uint NumHandlers
 
             public unsafe partial class CXXForRangeStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr rangeInit;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr rangeInit;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr inc;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(36)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr inc;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr rangeStmt;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(44)]
-                    internal global::System.IntPtr beginStmt;
+                    internal global::System.IntPtr rangeStmt;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr endStmt;
+                    internal global::System.IntPtr beginStmt;
 
                     [FieldOffset(52)]
-                    internal global::System.IntPtr loopVarStmt;
+                    internal global::System.IntPtr endStmt;
 
                     [FieldOffset(56)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
+                    internal global::System.IntPtr loopVarStmt;
 
                     [FieldOffset(60)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal coawaitLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
 
                     [FieldOffset(64)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal coawaitLoc;
 
                     [FieldOffset(68)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
+
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22956,31 +23059,34 @@ public CXXForRangeStmt(global::CppSharp.Parser.AST.CXXForRangeStmt _0)
 
             public unsafe partial class MSDependentExistsStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
+
+                    [FieldOffset(28)]
                     internal byte isIfExists;
 
-                    [FieldOffset(25)]
+                    [FieldOffset(29)]
                     internal byte isIfNotExists;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23105,58 +23211,61 @@ public bool IsIfNotExists
 
             public unsafe partial class CoroutineBodyStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal byte hasDependentPromiseType;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr body;
+                    internal byte hasDependentPromiseType;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr promiseDeclStmt;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr initSuspendStmt;
+                    internal global::System.IntPtr promiseDeclStmt;
 
                     [FieldOffset(36)]
-                    internal global::System.IntPtr finalSuspendStmt;
+                    internal global::System.IntPtr initSuspendStmt;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr exceptionHandler;
+                    internal global::System.IntPtr finalSuspendStmt;
 
                     [FieldOffset(44)]
-                    internal global::System.IntPtr fallthroughHandler;
+                    internal global::System.IntPtr exceptionHandler;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr allocate;
+                    internal global::System.IntPtr fallthroughHandler;
 
                     [FieldOffset(52)]
-                    internal global::System.IntPtr deallocate;
+                    internal global::System.IntPtr allocate;
 
                     [FieldOffset(56)]
-                    internal global::System.IntPtr returnValueInit;
+                    internal global::System.IntPtr deallocate;
 
                     [FieldOffset(60)]
-                    internal global::System.IntPtr resultDecl;
+                    internal global::System.IntPtr returnValueInit;
 
                     [FieldOffset(64)]
-                    internal global::System.IntPtr returnStmt;
+                    internal global::System.IntPtr resultDecl;
 
                     [FieldOffset(68)]
+                    internal global::System.IntPtr returnStmt;
+
+                    [FieldOffset(72)]
                     internal global::System.IntPtr returnStmtOnAllocFailure;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23558,31 +23667,34 @@ public bool HasDependentPromiseType
 
             public unsafe partial class CoreturnStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 36)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal byte isImplicit;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
+                    internal byte isImplicit;
 
                     [FieldOffset(28)]
-                    internal global::System.IntPtr operand;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
                     [FieldOffset(32)]
+                    internal global::System.IntPtr operand;
+
+                    [FieldOffset(36)]
                     internal global::System.IntPtr promiseCall;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23912,61 +24024,64 @@ public enum UnaryExprOrTypeTrait
 
             public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23976,8 +24091,8 @@ public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0Expr@AST@CppParser@CppSharp@@QAE@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0Expr@AST@CppParser@CppSharp@@QAE@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -24338,7 +24453,7 @@ public Expr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public Expr(global::CppSharp.Parser.AST.StmtClass klass)
+                public Expr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.Expr.__Internal));
@@ -24356,7 +24471,7 @@ public Expr(global::CppSharp.Parser.AST.Expr _0)
                     *((global::CppSharp.Parser.AST.Expr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.Expr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.Expr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.Expr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.Expr(klass);
                 }
@@ -24556,64 +24671,67 @@ public bool HasPlaceholderType
 
             public unsafe partial class FullExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -24623,8 +24741,8 @@ public unsafe partial class FullExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0FullExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0FullExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -24674,7 +24792,7 @@ public FullExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public FullExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public FullExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.FullExpr.__Internal));
@@ -24692,7 +24810,7 @@ public FullExpr(global::CppSharp.Parser.AST.FullExpr _0)
                     *((global::CppSharp.Parser.AST.FullExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.FullExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.FullExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.FullExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.FullExpr(klass);
                 }
@@ -24718,64 +24836,67 @@ public FullExpr(global::CppSharp.Parser.AST.FullExpr _0)
 
             public unsafe partial class ConstantExpr : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -24843,70 +24964,73 @@ public ConstantExpr(global::CppSharp.Parser.AST.ConstantExpr _0)
 
             public unsafe partial class OpaqueValueExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal byte isUnique;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr sourceExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25018,97 +25142,100 @@ public bool IsUnique
 
             public unsafe partial class DeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 100)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(61)]
+                    [FieldOffset(65)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr foundDecl;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal byte hasTemplateKWAndArgsInfo;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(85)]
+                    [FieldOffset(89)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal byte refersToEnclosingVariableOrCapture;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25341,60 +25468,63 @@ public unsafe partial class IntegerLiteral : global::CppSharp.Parser.AST.Expr, I
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [FieldOffset(64)]
@@ -25495,60 +25625,63 @@ public unsafe partial class FixedPointLiteral : global::CppSharp.Parser.AST.Expr
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [FieldOffset(64)]
@@ -25645,70 +25778,73 @@ public ulong Value
 
             public unsafe partial class CharacterLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.AST.CharacterLiteral.CharacterKind kind;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25824,70 +25960,73 @@ public uint Value
 
             public unsafe partial class FloatingLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal byte exact;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal double valueAsApproximateDouble;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25994,64 +26133,67 @@ public double ValueAsApproximateDouble
 
             public unsafe partial class ImaginaryLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26137,106 +26279,109 @@ public ImaginaryLiteral(global::CppSharp.Parser.AST.ImaginaryLiteral _0)
 
             public unsafe partial class StringLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 132)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C bytes;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal uint byteLength;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(112)]
                     internal uint length;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(116)]
                     internal uint charByteWidth;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.AST.StringLiteral.StringKind kind;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(124)]
                     internal byte isAscii;
 
-                    [FieldOffset(121)]
+                    [FieldOffset(125)]
                     internal byte isWide;
 
-                    [FieldOffset(122)]
+                    [FieldOffset(126)]
                     internal byte isUTF8;
 
-                    [FieldOffset(123)]
+                    [FieldOffset(127)]
                     internal byte isUTF16;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(128)]
                     internal byte isUTF32;
 
-                    [FieldOffset(125)]
+                    [FieldOffset(129)]
                     internal byte isPascal;
 
-                    [FieldOffset(126)]
+                    [FieldOffset(130)]
                     internal byte containsNonAscii;
 
-                    [FieldOffset(127)]
+                    [FieldOffset(131)]
                     internal byte containsNonAsciiOrNull;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(132)]
                     internal uint numConcatenated;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26535,67 +26680,70 @@ public uint NumConcatenated
 
             public unsafe partial class PredefinedExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.AST.PredefinedExpr.IdentKind identKind;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26701,70 +26849,73 @@ public PredefinedExpr(global::CppSharp.Parser.AST.PredefinedExpr _0)
 
             public unsafe partial class ParenExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParen;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParen;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26876,91 +27027,94 @@ public ParenExpr(global::CppSharp.Parser.AST.ParenExpr _0)
 
             public unsafe partial class UnaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 76)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.UnaryOperatorKind opcode;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal byte canOverflow;
 
-                    [FieldOffset(69)]
+                    [FieldOffset(73)]
                     internal byte isPrefix;
 
-                    [FieldOffset(70)]
+                    [FieldOffset(74)]
                     internal byte isPostfix;
 
-                    [FieldOffset(71)]
+                    [FieldOffset(75)]
                     internal byte isIncrementOp;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal byte isDecrementOp;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(77)]
                     internal byte isIncrementDecrementOp;
 
-                    [FieldOffset(74)]
+                    [FieldOffset(78)]
                     internal byte isArithmeticOp;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27163,73 +27317,76 @@ public bool IsArithmeticOp
 
             public unsafe partial class OffsetOfExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint numComponents;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal uint numExpressions;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27349,82 +27506,85 @@ public uint NumExpressions
 
             public unsafe partial class UnaryExprOrTypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 92)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.UnaryExprOrTypeTrait kind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal byte isArgumentType;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal argumentType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr argumentExpr;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeOfArgument;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27588,76 +27748,79 @@ public bool IsArgumentType
 
             public unsafe partial class ArraySubscriptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 76)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracketLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr idx;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27810,88 +27973,91 @@ public ArraySubscriptExpr(global::CppSharp.Parser.AST.ArraySubscriptExpr _0)
 
             public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 100)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal uint numArgs;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numCommas;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isCallToStdMove;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27901,8 +28067,8 @@ public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0CallExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0CallExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -27977,7 +28143,7 @@ public CallExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CallExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CallExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CallExpr.__Internal));
@@ -28035,7 +28201,7 @@ public void Cleararguments()
                     __Internal.Cleararguments((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CallExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CallExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CallExpr(klass);
                 }
@@ -28171,100 +28337,103 @@ public uint GetargumentsCount
 
             public unsafe partial class MemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 100)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte arrow;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(69)]
+                    [FieldOffset(73)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(85)]
+                    [FieldOffset(89)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isImplicitAccess;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28506,70 +28675,73 @@ public bool IsImplicitAccess
 
             public unsafe partial class CompoundLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr initializer;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte fileScope;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28681,82 +28853,85 @@ public bool FileScope
 
             public unsafe partial class CastExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 84)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28766,8 +28941,8 @@ public unsafe partial class CastExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0CastExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0CastExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -28817,7 +28992,7 @@ public CastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CastExpr.__Internal));
@@ -28835,7 +29010,7 @@ public CastExpr(global::CppSharp.Parser.AST.CastExpr _0)
                     *((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CastExpr(klass);
                 }
@@ -28949,85 +29124,88 @@ public uint PathSize
 
             public unsafe partial class ImplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte isPartOfExplicitCast;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29113,85 +29291,88 @@ public bool IsPartOfExplicitCast
 
             public unsafe partial class ExplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 92)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29201,8 +29382,8 @@ public unsafe partial class ExplicitCastExpr : global::CppSharp.Parser.AST.CastE
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0ExplicitCastExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0ExplicitCastExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -29252,7 +29433,7 @@ public ExplicitCastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public ExplicitCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public ExplicitCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal));
@@ -29270,7 +29451,7 @@ public ExplicitCastExpr(global::CppSharp.Parser.AST.ExplicitCastExpr _0)
                     *((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.ExplicitCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.ExplicitCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.ExplicitCastExpr(klass);
                 }
@@ -29291,91 +29472,94 @@ public ExplicitCastExpr(global::CppSharp.Parser.AST.ExplicitCastExpr _0)
 
             public unsafe partial class CStyleCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 100)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29469,118 +29653,121 @@ public CStyleCastExpr(global::CppSharp.Parser.AST.CStyleCastExpr _0)
 
             public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind opcode;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isPtrMemOp;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(101)]
                     internal byte isMultiplicativeOp;
 
-                    [FieldOffset(98)]
+                    [FieldOffset(102)]
                     internal byte isAdditiveOp;
 
-                    [FieldOffset(99)]
+                    [FieldOffset(103)]
                     internal byte isShiftOp;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal byte isBitwiseOp;
 
-                    [FieldOffset(101)]
+                    [FieldOffset(105)]
                     internal byte isRelationalOp;
 
-                    [FieldOffset(102)]
+                    [FieldOffset(106)]
                     internal byte isEqualityOp;
 
-                    [FieldOffset(103)]
+                    [FieldOffset(107)]
                     internal byte isComparisonOp;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal byte isLogicalOp;
 
-                    [FieldOffset(105)]
+                    [FieldOffset(109)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(106)]
+                    [FieldOffset(110)]
                     internal byte isCompoundAssignmentOp;
 
-                    [FieldOffset(107)]
+                    [FieldOffset(111)]
                     internal byte isShiftAssignOp;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(112)]
                     internal byte isFPContractableWithinStatement;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(113)]
                     internal byte isFEnvAccessOn;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29590,8 +29777,8 @@ public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, I
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0BinaryOperator@AST@CppParser@CppSharp@@QAE@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0BinaryOperator@AST@CppParser@CppSharp@@QAE@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -29646,7 +29833,7 @@ public BinaryOperator()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public BinaryOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public BinaryOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.BinaryOperator.__Internal));
@@ -29680,7 +29867,7 @@ public override void Dispose(bool disposing)
                     __Instance = IntPtr.Zero;
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.BinaryOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.BinaryOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.BinaryOperator(klass);
                 }
@@ -29948,124 +30135,127 @@ public bool IsFEnvAccessOn
 
             public unsafe partial class CompoundAssignOperator : global::CppSharp.Parser.AST.BinaryOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 132)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind opcode;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isPtrMemOp;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(101)]
                     internal byte isMultiplicativeOp;
 
-                    [FieldOffset(98)]
+                    [FieldOffset(102)]
                     internal byte isAdditiveOp;
 
-                    [FieldOffset(99)]
+                    [FieldOffset(103)]
                     internal byte isShiftOp;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal byte isBitwiseOp;
 
-                    [FieldOffset(101)]
+                    [FieldOffset(105)]
                     internal byte isRelationalOp;
 
-                    [FieldOffset(102)]
+                    [FieldOffset(106)]
                     internal byte isEqualityOp;
 
-                    [FieldOffset(103)]
+                    [FieldOffset(107)]
                     internal byte isComparisonOp;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal byte isLogicalOp;
 
-                    [FieldOffset(105)]
+                    [FieldOffset(109)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(106)]
+                    [FieldOffset(110)]
                     internal byte isCompoundAssignmentOp;
 
-                    [FieldOffset(107)]
+                    [FieldOffset(111)]
                     internal byte isShiftAssignOp;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(112)]
                     internal byte isFPContractableWithinStatement;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(113)]
                     internal byte isFEnvAccessOn;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal computationLHSType;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(124)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal computationResultType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30180,76 +30370,79 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class AbstractConditionalOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 76)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30259,8 +30452,8 @@ public unsafe partial class AbstractConditionalOperator : global::CppSharp.Parse
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0AbstractConditionalOperator@AST@CppParser@CppSharp@@QAE@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0AbstractConditionalOperator@AST@CppParser@CppSharp@@QAE@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -30310,7 +30503,7 @@ public AbstractConditionalOperator()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public AbstractConditionalOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public AbstractConditionalOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal));
@@ -30328,7 +30521,7 @@ public AbstractConditionalOperator(global::CppSharp.Parser.AST.AbstractCondition
                     *((global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.AbstractConditionalOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.AbstractConditionalOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.AbstractConditionalOperator(klass);
                 }
@@ -30416,82 +30609,85 @@ public AbstractConditionalOperator(global::CppSharp.Parser.AST.AbstractCondition
 
             public unsafe partial class ConditionalOperator : global::CppSharp.Parser.AST.AbstractConditionalOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 84)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr rHS;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30595,82 +30791,85 @@ public ConditionalOperator(global::CppSharp.Parser.AST.ConditionalOperator _0)
 
             public unsafe partial class BinaryConditionalOperator : global::CppSharp.Parser.AST.AbstractConditionalOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 84)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr common;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr opaqueValue;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30774,67 +30973,70 @@ public BinaryConditionalOperator(global::CppSharp.Parser.AST.BinaryConditionalOp
 
             public unsafe partial class AddrLabelExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ampAmpLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal labelLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30928,70 +31130,73 @@ public AddrLabelExpr(global::CppSharp.Parser.AST.AddrLabelExpr _0)
 
             public unsafe partial class StmtExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subStmt;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31103,70 +31308,73 @@ public StmtExpr(global::CppSharp.Parser.AST.StmtExpr _0)
 
             public unsafe partial class ShuffleVectorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint numSubExprs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31273,70 +31481,73 @@ public uint NumSubExprs
 
             public unsafe partial class ConvertVectorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr srcExpr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31448,85 +31659,88 @@ public ConvertVectorExpr(global::CppSharp.Parser.AST.ConvertVectorExpr _0)
 
             public unsafe partial class ChooseExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal byte isConditionTrue;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal byte isConditionDependent;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr chosenSubExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31718,64 +31932,67 @@ public bool IsConditionDependent
 
             public unsafe partial class GNUNullExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tokenLocation;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31856,73 +32073,76 @@ public GNUNullExpr(global::CppSharp.Parser.AST.GNUNullExpr _0)
 
             public unsafe partial class VAArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte isMicrosoftABI;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -32047,97 +32267,100 @@ public bool IsMicrosoftABI
 
             public unsafe partial class InitListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 92)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr arrayFiller;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBraceLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBraceLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr syntacticForm;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal uint numInits;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte hasArrayFiller;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(81)]
                     internal byte isExplicit;
 
-                    [FieldOffset(78)]
+                    [FieldOffset(82)]
                     internal byte isStringLiteralInit;
 
-                    [FieldOffset(79)]
+                    [FieldOffset(83)]
                     internal byte isTransparent;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal byte isSemanticForm;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr semanticForm;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal byte isSyntacticForm;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -32376,79 +32599,82 @@ public bool IsSyntacticForm
 
             public unsafe partial class DesignatedInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 84)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal equalOrColonLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr init;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint size;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal byte usesGNUSyntax;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal uint numSubExprs;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceRange.__Internal designatorsSourceRange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33044,61 +33270,64 @@ public uint NumSubExprs
 
             public unsafe partial class NoInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33166,67 +33395,70 @@ public NoInitExpr(global::CppSharp.Parser.AST.NoInitExpr _0)
 
             public unsafe partial class DesignatedInitUpdateExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr updater;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33330,67 +33562,70 @@ public DesignatedInitUpdateExpr(global::CppSharp.Parser.AST.DesignatedInitUpdate
 
             public unsafe partial class ArrayInitLoopExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33494,61 +33729,64 @@ public ArrayInitLoopExpr(global::CppSharp.Parser.AST.ArrayInitLoopExpr _0)
 
             public unsafe partial class ArrayInitIndexExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33616,61 +33854,64 @@ public ArrayInitIndexExpr(global::CppSharp.Parser.AST.ArrayInitIndexExpr _0)
 
             public unsafe partial class ImplicitValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33738,70 +33979,73 @@ public ImplicitValueInitExpr(global::CppSharp.Parser.AST.ImplicitValueInitExpr _
 
             public unsafe partial class ParenListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numExprs;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33908,85 +34152,88 @@ public uint NumExprs
 
             public unsafe partial class GenericSelectionExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numAssocs;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal genericLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal defaultLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr controllingExpr;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte isResultDependent;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint resultIndex;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr resultExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34168,76 +34415,79 @@ public uint ResultIndex
 
             public unsafe partial class ExtVectorElementExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal accessorLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint numElements;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal byte containsDuplicateElements;
 
-                    [FieldOffset(69)]
+                    [FieldOffset(73)]
                     internal byte isArrow;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34375,67 +34625,70 @@ public bool IsArrow
 
             public unsafe partial class BlockExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal caretLocation;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr body;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34534,70 +34787,73 @@ public BlockExpr(global::CppSharp.Parser.AST.BlockExpr _0)
 
             public unsafe partial class AsTypeExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr srcExpr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34709,73 +34965,76 @@ public AsTypeExpr(global::CppSharp.Parser.AST.AsTypeExpr _0)
 
             public unsafe partial class PseudoObjectExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr syntacticForm;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal uint resultExprIndex;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr resultExpr;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal uint numSemanticExprs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34905,106 +35164,109 @@ public uint NumSemanticExprs
 
             public unsafe partial class AtomicExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr ptr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr order;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr scope;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr val1;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr orderFail;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr val2;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr weak;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal valueType;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.AST.AtomicExpr.AtomicOp op;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal uint numSubExprs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal byte isVolatile;
 
-                    [FieldOffset(101)]
+                    [FieldOffset(105)]
                     internal byte isCmpXChg;
 
-                    [FieldOffset(102)]
+                    [FieldOffset(106)]
                     internal byte isOpenCL;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35352,61 +35614,64 @@ public bool IsOpenCL
 
             public unsafe partial class TypoExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35474,103 +35739,106 @@ public TypoExpr(global::CppSharp.Parser.AST.TypoExpr _0)
 
             public unsafe partial class CXXOperatorCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 116)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal uint numArgs;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numCommas;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.AST.OverloadedOperatorKind _operator;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(105)]
+                    [FieldOffset(109)]
                     internal byte isInfixBinaryOp;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(116)]
                     internal byte isFPContractableWithinStatement;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35724,94 +35992,97 @@ public bool IsFPContractableWithinStatement
 
             public unsafe partial class CXXMemberCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 108)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal uint numArgs;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numCommas;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr implicitObjectArgument;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::System.IntPtr methodDecl;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35936,91 +36207,94 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CUDAKernelCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 108)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal uint numArgs;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numCommas;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr config;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36127,97 +36401,100 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CXXNamedCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36227,8 +36504,8 @@ public unsafe partial class CXXNamedCastExpr : global::CppSharp.Parser.AST.Expli
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0CXXNamedCastExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0CXXNamedCastExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -36278,7 +36555,7 @@ public CXXNamedCastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CXXNamedCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CXXNamedCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal));
@@ -36296,7 +36573,7 @@ public CXXNamedCastExpr(global::CppSharp.Parser.AST.CXXNamedCastExpr _0)
                     *((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CXXNamedCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CXXNamedCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CXXNamedCastExpr(klass);
                 }
@@ -36356,97 +36633,100 @@ public string CastName
 
             public unsafe partial class CXXStaticCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36514,100 +36794,103 @@ public CXXStaticCastExpr(global::CppSharp.Parser.AST.CXXStaticCastExpr _0)
 
             public unsafe partial class CXXDynamicCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 116)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(116)]
                     internal byte isAlwaysNull;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36688,97 +36971,100 @@ public bool IsAlwaysNull
 
             public unsafe partial class CXXReinterpretCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36846,97 +37132,100 @@ public CXXReinterpretCastExpr(global::CppSharp.Parser.AST.CXXReinterpretCastExpr
 
             public unsafe partial class CXXConstCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37004,97 +37293,100 @@ public CXXConstCastExpr(global::CppSharp.Parser.AST.CXXConstCastExpr _0)
 
             public unsafe partial class UserDefinedLiteral : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal uint numArgs;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numCommas;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.AST.UserDefinedLiteral.LiteralOperatorKind literalOperatorKind;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::System.IntPtr cookedLiteral;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal uDSuffixLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37237,67 +37529,70 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CXXBoolLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal byte value;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37391,64 +37686,67 @@ public bool Value
 
             public unsafe partial class CXXNullPtrLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37529,64 +37827,67 @@ public CXXNullPtrLiteralExpr(global::CppSharp.Parser.AST.CXXNullPtrLiteralExpr _
 
             public unsafe partial class CXXStdInitializerListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37672,70 +37973,73 @@ public CXXStdInitializerListExpr(global::CppSharp.Parser.AST.CXXStdInitializerLi
 
             public unsafe partial class CXXTypeidExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr exprOperand;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte isPotentiallyEvaluated;
 
-                    [FieldOffset(61)]
+                    [FieldOffset(65)]
                     internal byte isTypeOperand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37847,73 +38151,76 @@ public bool IsTypeOperand
 
             public unsafe partial class MSPropertyRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr baseExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal byte isArrow;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38038,70 +38345,73 @@ public bool IsArrow
 
             public unsafe partial class MSPropertySubscriptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracketLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr idx;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38218,70 +38528,73 @@ public MSPropertySubscriptExpr(global::CppSharp.Parser.AST.MSPropertySubscriptEx
 
             public unsafe partial class CXXUuidofExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr exprOperand;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C uuidStr;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte isTypeOperand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38417,67 +38730,70 @@ public bool IsTypeOperand
 
             public unsafe partial class CXXThisExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte @implicit;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38571,70 +38887,73 @@ public bool Implicit
 
             public unsafe partial class CXXThrowExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal throwLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal byte isThrownVariableInScope;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38746,67 +39065,70 @@ public bool IsThrownVariableInScope
 
             public unsafe partial class CXXDefaultArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr expr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal usedLocation;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38905,67 +39227,70 @@ public CXXDefaultArgExpr(global::CppSharp.Parser.AST.CXXDefaultArgExpr _0)
 
             public unsafe partial class CXXDefaultInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr field;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr expr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39069,64 +39394,67 @@ public CXXDefaultInitExpr(global::CppSharp.Parser.AST.CXXDefaultInitExpr _0)
 
             public unsafe partial class CXXBindTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39212,88 +39540,91 @@ public CXXBindTemporaryExpr(global::CppSharp.Parser.AST.CXXBindTemporaryExpr _0)
 
             public unsafe partial class CXXConstructExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 92)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal byte elidable;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(77)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(74)]
+                    [FieldOffset(78)]
                     internal byte listInitialization;
 
-                    [FieldOffset(75)]
+                    [FieldOffset(79)]
                     internal byte stdInitListInitialization;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte requiresZeroInitialization;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceRange.__Internal parenOrBraceRange;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39303,8 +39634,8 @@ public unsafe partial class CXXConstructExpr : global::CppSharp.Parser.AST.Expr,
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0CXXConstructExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0CXXConstructExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -39387,7 +39718,7 @@ public CXXConstructExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CXXConstructExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CXXConstructExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CXXConstructExpr.__Internal));
@@ -39445,7 +39776,7 @@ public void Cleararguments()
                     __Internal.Cleararguments((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CXXConstructExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CXXConstructExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CXXConstructExpr(klass);
                 }
@@ -39566,70 +39897,73 @@ public uint GetargumentsCount
 
             public unsafe partial class CXXInheritedCtorInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal byte constructsVBase;
 
-                    [FieldOffset(57)]
+                    [FieldOffset(61)]
                     internal byte inheritedFromVBase;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39736,94 +40070,97 @@ public bool InheritedFromVBase
 
             public unsafe partial class CXXFunctionalCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 108)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte path_empty;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint path_size;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal byte isListInitialization;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39930,88 +40267,91 @@ public bool IsListInitialization
 
             public unsafe partial class CXXTemporaryObjectExpr : global::CppSharp.Parser.AST.CXXConstructExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 92)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal byte elidable;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(77)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(74)]
+                    [FieldOffset(78)]
                     internal byte listInitialization;
 
-                    [FieldOffset(75)]
+                    [FieldOffset(79)]
                     internal byte stdInitListInitialization;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte requiresZeroInitialization;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceRange.__Internal parenOrBraceRange;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40100,91 +40440,94 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class LambdaExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 100)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ capture_inits;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal captureDefaultLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal uint capture_size;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceRange.__Internal introducerRange;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr callOperator;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal byte isGenericLambda;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr body;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isMutable;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(101)]
                     internal byte hasExplicitParameters;
 
-                    [FieldOffset(98)]
+                    [FieldOffset(102)]
                     internal byte hasExplicitResultType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40453,64 +40796,67 @@ public uint GetcaptureInitsCount
 
             public unsafe partial class CXXScalarValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 60)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40591,106 +40937,109 @@ public CXXScalarValueInitExpr(global::CppSharp.Parser.AST.CXXScalarValueInitExpr
 
             public unsafe partial class CXXNewExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 132)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ placement_arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr operatorNew;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr operatorDelete;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal allocatedType;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte isArray;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal global::System.IntPtr arraySize;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal uint numPlacementArgs;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal byte isParenTypeId;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceRange.__Internal typeIdParens;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(112)]
                     internal byte isGlobalNew;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(113)]
                     internal byte hasInitializer;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.AST.CXXNewExpr.InitializationStyle initializationStyle;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr initializer;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(124)]
                     internal global::System.IntPtr constructExpr;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceRange.__Internal directInitRange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41046,79 +41395,82 @@ public uint GetplacementArgumentsCount
 
             public unsafe partial class CXXDeleteExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 76)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal byte isGlobalDelete;
 
-                    [FieldOffset(57)]
+                    [FieldOffset(61)]
                     internal byte isArrayForm;
 
-                    [FieldOffset(58)]
+                    [FieldOffset(62)]
                     internal byte isArrayFormAsWritten;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr operatorDelete;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr argument;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal destroyedType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41274,85 +41626,88 @@ public bool IsArrayFormAsWritten
 
             public unsafe partial class CXXPseudoDestructorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(61)]
+                    [FieldOffset(65)]
                     internal byte isArrow;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonColonLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tildeLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal destroyedType;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal destroyedTypeLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41529,67 +41884,70 @@ public bool IsArrow
 
             public unsafe partial class TypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal byte value;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41683,70 +42041,73 @@ public uint NumArgs
 
             public unsafe partial class ArrayTypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal queriedType;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal ulong value;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr dimensionExpression;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41858,67 +42219,70 @@ public ulong Value
 
             public unsafe partial class ExpressionTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr queriedExpression;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42017,85 +42381,88 @@ public bool Value
 
             public unsafe partial class OverloadExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 84)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numDecls;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(81)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42105,8 +42472,8 @@ public unsafe partial class OverloadExpr : global::CppSharp.Parser.AST.Expr, IDi
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0OverloadExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0OverloadExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -42244,7 +42611,7 @@ public OverloadExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public OverloadExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public OverloadExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.OverloadExpr.__Internal));
@@ -42262,7 +42629,7 @@ public OverloadExpr(global::CppSharp.Parser.AST.OverloadExpr _0)
                     *((global::CppSharp.Parser.AST.OverloadExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.OverloadExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.OverloadExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.OverloadExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.OverloadExpr(klass);
                 }
@@ -42374,91 +42741,94 @@ public uint NumTemplateArgs
 
             public unsafe partial class UnresolvedLookupExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numDecls;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(81)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte requiresADL;
 
-                    [FieldOffset(85)]
+                    [FieldOffset(89)]
                     internal byte isOverloaded;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42552,82 +42922,85 @@ public bool IsOverloaded
 
             public unsafe partial class DependentScopeDeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(77)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42786,70 +43159,73 @@ public uint NumTemplateArgs
 
             public unsafe partial class ExprWithCleanups : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal uint numObjects;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal byte cleanupsHaveSideEffects;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42943,79 +43319,82 @@ public bool CleanupsHaveSideEffects
 
             public unsafe partial class CXXUnresolvedConstructExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 92)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
+
+                    [FieldOffset(16)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
-                    [FieldOffset(16)]
+                    [FieldOffset(20)]
                     internal global::System.IntPtr stripLabelLikeStatements;
 
-                    [FieldOffset(20)]
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte isListInitialization;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal uint arg_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43222,100 +43601,103 @@ public uint GetargumentsCount
 
             public unsafe partial class CXXDependentScopeMemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 108)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal baseType;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal byte isArrow;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr firstQualifierFoundInScope;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(101)]
+                    [FieldOffset(105)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43562,106 +43944,109 @@ public uint NumTemplateArgs
 
             public unsafe partial class UnresolvedMemberExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal uint numDecls;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(81)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(92)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal baseType;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(104)]
                     internal byte hasUnresolvedUsing;
 
-                    [FieldOffset(101)]
+                    [FieldOffset(105)]
                     internal byte isArrow;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43825,67 +44210,70 @@ public bool IsArrow
 
             public unsafe partial class CXXNoexceptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal byte value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43984,67 +44372,70 @@ public bool Value
 
             public unsafe partial class PackExpansionExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr pattern;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44143,79 +44534,82 @@ public PackExpansionExpr(global::CppSharp.Parser.AST.PackExpansionExpr _0)
 
             public unsafe partial class SizeOfPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal packLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr pack;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal uint packLength;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal byte isPartiallySubstituted;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44366,67 +44760,70 @@ public bool IsPartiallySubstituted
 
             public unsafe partial class SubstNonTypeTemplateParmExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr replacement;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44525,67 +44922,70 @@ public SubstNonTypeTemplateParmExpr(global::CppSharp.Parser.AST.SubstNonTypeTemp
 
             public unsafe partial class SubstNonTypeTemplateParmPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal parameterPackLocation;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.AST.TemplateArgument.__Internal argumentPack;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44679,67 +45079,70 @@ public SubstNonTypeTemplateParmPackExpr(global::CppSharp.Parser.AST.SubstNonType
 
             public unsafe partial class FunctionParmPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 68)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal parameterPackLocation;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal uint numExpansions;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44833,73 +45236,76 @@ public uint NumExpansions
 
             public unsafe partial class MaterializeTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 76)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr temporary;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr TemporaryExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal uint manglingNumber;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal byte isBoundToLvalueReference;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45117,85 +45523,88 @@ public bool IsBoundToLvalueReference
 
             public unsafe partial class CXXFoldExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 84)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal byte isRightFold;
 
-                    [FieldOffset(65)]
+                    [FieldOffset(69)]
                     internal byte isLeftFold;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr pattern;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr init;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind _operator;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45387,79 +45796,82 @@ public bool IsLeftFold
 
             public unsafe partial class CoroutineSuspendExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr resumeExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45469,8 +45881,8 @@ public unsafe partial class CoroutineSuspendExpr : global::CppSharp.Parser.AST.E
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0CoroutineSuspendExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0CoroutineSuspendExpr@AST@CppParser@CppSharp@@QAE@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -45529,7 +45941,7 @@ public CoroutineSuspendExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CoroutineSuspendExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CoroutineSuspendExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal));
@@ -45547,7 +45959,7 @@ public CoroutineSuspendExpr(global::CppSharp.Parser.AST.CoroutineSuspendExpr _0)
                     *((global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CoroutineSuspendExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CoroutineSuspendExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CoroutineSuspendExpr(klass);
                 }
@@ -45658,85 +46070,88 @@ public CoroutineSuspendExpr(global::CppSharp.Parser.AST.CoroutineSuspendExpr _0)
 
             public unsafe partial class CoawaitExpr : global::CppSharp.Parser.AST.CoroutineSuspendExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr resumeExpr;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal byte isImplicit;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr operand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45835,70 +46250,73 @@ public bool IsImplicit
 
             public unsafe partial class DependentCoawaitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr operatorCoawaitLookup;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -46015,82 +46433,85 @@ public DependentCoawaitExpr(global::CppSharp.Parser.AST.DependentCoawaitExpr _0)
 
             public unsafe partial class CoyieldExpr : global::CppSharp.Parser.AST.CoroutineSuspendExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 84)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
                     internal byte valueDependent;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(33)]
                     internal byte typeDependent;
 
-                    [FieldOffset(30)]
+                    [FieldOffset(34)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(31)]
+                    [FieldOffset(35)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(36)]
+                    [FieldOffset(40)]
                     internal byte isLValue;
 
-                    [FieldOffset(37)]
+                    [FieldOffset(41)]
                     internal byte isRValue;
 
-                    [FieldOffset(38)]
+                    [FieldOffset(42)]
                     internal byte isXValue;
 
-                    [FieldOffset(39)]
+                    [FieldOffset(43)]
                     internal byte isGLValue;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(44)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(52)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(56)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(60)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(68)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(68)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(76)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr resumeExpr;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(84)]
                     internal global::System.IntPtr operand;
 
                     [SuppressUnmanagedCodeSecurity]
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
index b304cb97c3..bc2fd78cfa 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
@@ -17334,151 +17334,24 @@ namespace Parser
     {
         namespace AST
         {
-            public enum StmtClass
-            {
-                NoStmt = 0,
-                GCCAsmStmt = 1,
-                MSAsmStmt = 2,
-                AttributedStmt = 3,
-                BreakStmt = 4,
-                CXXCatchStmt = 5,
-                CXXForRangeStmt = 6,
-                CXXTryStmt = 7,
-                CapturedStmt = 8,
-                CompoundStmt = 9,
-                ContinueStmt = 10,
-                CoreturnStmt = 11,
-                CoroutineBodyStmt = 12,
-                DeclStmt = 13,
-                DoStmt = 14,
-                BinaryConditionalOperator = 15,
-                ConditionalOperator = 16,
-                AddrLabelExpr = 17,
-                ArrayInitIndexExpr = 18,
-                ArrayInitLoopExpr = 19,
-                ArraySubscriptExpr = 20,
-                ArrayTypeTraitExpr = 21,
-                AsTypeExpr = 22,
-                AtomicExpr = 23,
-                BinaryOperator = 24,
-                CompoundAssignOperator = 25,
-                BlockExpr = 26,
-                CXXBindTemporaryExpr = 27,
-                CXXBoolLiteralExpr = 28,
-                CXXConstructExpr = 29,
-                CXXTemporaryObjectExpr = 30,
-                CXXDefaultArgExpr = 31,
-                CXXDefaultInitExpr = 32,
-                CXXDeleteExpr = 33,
-                CXXDependentScopeMemberExpr = 34,
-                CXXFoldExpr = 35,
-                CXXInheritedCtorInitExpr = 36,
-                CXXNewExpr = 37,
-                CXXNoexceptExpr = 38,
-                CXXNullPtrLiteralExpr = 39,
-                CXXPseudoDestructorExpr = 40,
-                CXXScalarValueInitExpr = 41,
-                CXXStdInitializerListExpr = 42,
-                CXXThisExpr = 43,
-                CXXThrowExpr = 44,
-                CXXTypeidExpr = 45,
-                CXXUnresolvedConstructExpr = 46,
-                CXXUuidofExpr = 47,
-                CallExpr = 48,
-                CUDAKernelCallExpr = 49,
-                CXXMemberCallExpr = 50,
-                CXXOperatorCallExpr = 51,
-                UserDefinedLiteral = 52,
-                CStyleCastExpr = 53,
-                CXXFunctionalCastExpr = 54,
-                CXXConstCastExpr = 55,
-                CXXDynamicCastExpr = 56,
-                CXXReinterpretCastExpr = 57,
-                CXXStaticCastExpr = 58,
-                ImplicitCastExpr = 60,
-                CharacterLiteral = 61,
-                ChooseExpr = 62,
-                CompoundLiteralExpr = 63,
-                ConvertVectorExpr = 64,
-                CoawaitExpr = 65,
-                CoyieldExpr = 66,
-                DeclRefExpr = 67,
-                DependentCoawaitExpr = 68,
-                DependentScopeDeclRefExpr = 69,
-                DesignatedInitExpr = 70,
-                DesignatedInitUpdateExpr = 71,
-                ExpressionTraitExpr = 72,
-                ExtVectorElementExpr = 73,
-                FixedPointLiteral = 74,
-                FloatingLiteral = 75,
-                ConstantExpr = 76,
-                ExprWithCleanups = 77,
-                FunctionParmPackExpr = 78,
-                GNUNullExpr = 79,
-                GenericSelectionExpr = 80,
-                ImaginaryLiteral = 81,
-                ImplicitValueInitExpr = 82,
-                InitListExpr = 83,
-                IntegerLiteral = 84,
-                LambdaExpr = 85,
-                MSPropertyRefExpr = 86,
-                MSPropertySubscriptExpr = 87,
-                MaterializeTemporaryExpr = 88,
-                MemberExpr = 89,
-                NoInitExpr = 90,
-                OffsetOfExpr = 107,
-                OpaqueValueExpr = 108,
-                UnresolvedLookupExpr = 109,
-                UnresolvedMemberExpr = 110,
-                PackExpansionExpr = 111,
-                ParenExpr = 112,
-                ParenListExpr = 113,
-                PredefinedExpr = 114,
-                PseudoObjectExpr = 115,
-                ShuffleVectorExpr = 116,
-                SizeOfPackExpr = 117,
-                StmtExpr = 118,
-                StringLiteral = 119,
-                SubstNonTypeTemplateParmExpr = 120,
-                SubstNonTypeTemplateParmPackExpr = 121,
-                TypeTraitExpr = 122,
-                TypoExpr = 123,
-                UnaryExprOrTypeTraitExpr = 124,
-                UnaryOperator = 125,
-                VAArgExpr = 126,
-                ForStmt = 127,
-                GotoStmt = 128,
-                IfStmt = 129,
-                IndirectGotoStmt = 130,
-                LabelStmt = 131,
-                MSDependentExistsStmt = 132,
-                NullStmt = 133,
-                ReturnStmt = 188,
-                SEHExceptStmt = 189,
-                SEHFinallyStmt = 190,
-                SEHLeaveStmt = 191,
-                SEHTryStmt = 192,
-                CaseStmt = 193,
-                DefaultStmt = 194,
-                SwitchStmt = 195,
-                WhileStmt = 196
-            }
-
             public unsafe partial class Stmt : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+
+                    [FieldOffset(24)]
                     internal global::System.IntPtr stripLabelLikeStatements;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17488,8 +17361,8 @@ public partial struct __Internal
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST4StmtC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST4StmtC2ENS2_9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -17497,6 +17370,136 @@ public partial struct __Internal
                     internal static extern void cctor(global::System.IntPtr __instance, global::System.IntPtr _0);
                 }
 
+                public enum StmtClass
+                {
+                    NoStmt = 0,
+                    GCCAsmStmt = 1,
+                    MSAsmStmt = 2,
+                    AttributedStmt = 3,
+                    BreakStmt = 4,
+                    CXXCatchStmt = 5,
+                    CXXForRangeStmt = 6,
+                    CXXTryStmt = 7,
+                    CapturedStmt = 8,
+                    CompoundStmt = 9,
+                    ContinueStmt = 10,
+                    CoreturnStmt = 11,
+                    CoroutineBodyStmt = 12,
+                    DeclStmt = 13,
+                    DoStmt = 14,
+                    BinaryConditionalOperator = 15,
+                    ConditionalOperator = 16,
+                    AddrLabelExpr = 17,
+                    ArrayInitIndexExpr = 18,
+                    ArrayInitLoopExpr = 19,
+                    ArraySubscriptExpr = 20,
+                    ArrayTypeTraitExpr = 21,
+                    AsTypeExpr = 22,
+                    AtomicExpr = 23,
+                    BinaryOperator = 24,
+                    CompoundAssignOperator = 25,
+                    BlockExpr = 26,
+                    CXXBindTemporaryExpr = 27,
+                    CXXBoolLiteralExpr = 28,
+                    CXXConstructExpr = 29,
+                    CXXTemporaryObjectExpr = 30,
+                    CXXDefaultArgExpr = 31,
+                    CXXDefaultInitExpr = 32,
+                    CXXDeleteExpr = 33,
+                    CXXDependentScopeMemberExpr = 34,
+                    CXXFoldExpr = 35,
+                    CXXInheritedCtorInitExpr = 36,
+                    CXXNewExpr = 37,
+                    CXXNoexceptExpr = 38,
+                    CXXNullPtrLiteralExpr = 39,
+                    CXXPseudoDestructorExpr = 40,
+                    CXXScalarValueInitExpr = 41,
+                    CXXStdInitializerListExpr = 42,
+                    CXXThisExpr = 43,
+                    CXXThrowExpr = 44,
+                    CXXTypeidExpr = 45,
+                    CXXUnresolvedConstructExpr = 46,
+                    CXXUuidofExpr = 47,
+                    CallExpr = 48,
+                    CUDAKernelCallExpr = 49,
+                    CXXMemberCallExpr = 50,
+                    CXXOperatorCallExpr = 51,
+                    UserDefinedLiteral = 52,
+                    CStyleCastExpr = 53,
+                    CXXFunctionalCastExpr = 54,
+                    CXXConstCastExpr = 55,
+                    CXXDynamicCastExpr = 56,
+                    CXXReinterpretCastExpr = 57,
+                    CXXStaticCastExpr = 58,
+                    ImplicitCastExpr = 60,
+                    CharacterLiteral = 61,
+                    ChooseExpr = 62,
+                    CompoundLiteralExpr = 63,
+                    ConvertVectorExpr = 64,
+                    CoawaitExpr = 65,
+                    CoyieldExpr = 66,
+                    DeclRefExpr = 67,
+                    DependentCoawaitExpr = 68,
+                    DependentScopeDeclRefExpr = 69,
+                    DesignatedInitExpr = 70,
+                    DesignatedInitUpdateExpr = 71,
+                    ExpressionTraitExpr = 72,
+                    ExtVectorElementExpr = 73,
+                    FixedPointLiteral = 74,
+                    FloatingLiteral = 75,
+                    ConstantExpr = 76,
+                    ExprWithCleanups = 77,
+                    FunctionParmPackExpr = 78,
+                    GNUNullExpr = 79,
+                    GenericSelectionExpr = 80,
+                    ImaginaryLiteral = 81,
+                    ImplicitValueInitExpr = 82,
+                    InitListExpr = 83,
+                    IntegerLiteral = 84,
+                    LambdaExpr = 85,
+                    MSPropertyRefExpr = 86,
+                    MSPropertySubscriptExpr = 87,
+                    MaterializeTemporaryExpr = 88,
+                    MemberExpr = 89,
+                    NoInitExpr = 90,
+                    OffsetOfExpr = 107,
+                    OpaqueValueExpr = 108,
+                    UnresolvedLookupExpr = 109,
+                    UnresolvedMemberExpr = 110,
+                    PackExpansionExpr = 111,
+                    ParenExpr = 112,
+                    ParenListExpr = 113,
+                    PredefinedExpr = 114,
+                    PseudoObjectExpr = 115,
+                    ShuffleVectorExpr = 116,
+                    SizeOfPackExpr = 117,
+                    StmtExpr = 118,
+                    StringLiteral = 119,
+                    SubstNonTypeTemplateParmExpr = 120,
+                    SubstNonTypeTemplateParmPackExpr = 121,
+                    TypeTraitExpr = 122,
+                    TypoExpr = 123,
+                    UnaryExprOrTypeTraitExpr = 124,
+                    UnaryOperator = 125,
+                    VAArgExpr = 126,
+                    ForStmt = 127,
+                    GotoStmt = 128,
+                    IfStmt = 129,
+                    IndirectGotoStmt = 130,
+                    LabelStmt = 131,
+                    MSDependentExistsStmt = 132,
+                    NullStmt = 133,
+                    ReturnStmt = 188,
+                    SEHExceptStmt = 189,
+                    SEHFinallyStmt = 190,
+                    SEHLeaveStmt = 191,
+                    SEHTryStmt = 192,
+                    CaseStmt = 193,
+                    DefaultStmt = 194,
+                    SwitchStmt = 195,
+                    WhileStmt = 196
+                }
+
                 public global::System.IntPtr __Instance { get; protected set; }
 
                 protected int __PointerAdjustment;
@@ -17544,7 +17547,7 @@ public Stmt()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public Stmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public Stmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.Stmt.__Internal));
                     __ownsNativeInstance = true;
@@ -17576,12 +17579,12 @@ public virtual void Dispose(bool disposing)
                     __Instance = IntPtr.Zero;
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.Stmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.Stmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.Stmt(klass);
                 }
 
-                public global::CppSharp.Parser.AST.StmtClass StmtClass
+                public global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass
                 {
                     get
                     {
@@ -17607,6 +17610,19 @@ public virtual void Dispose(bool disposing)
                     }
                 }
 
+                public global::CppSharp.Parser.SourceLocation BeginLoc
+                {
+                    get
+                    {
+                        return global::CppSharp.Parser.SourceLocation.__CreateInstance(((global::CppSharp.Parser.AST.Stmt.__Internal*) __Instance)->beginLoc);
+                    }
+
+                    set
+                    {
+                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->beginLoc = value.__Instance;
+                    }
+                }
+
                 public global::CppSharp.Parser.SourceLocation EndLoc
                 {
                     get
@@ -17641,28 +17657,31 @@ public virtual void Dispose(bool disposing)
 
             public unsafe partial class DeclStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_allocator__S0_ decls;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isSingleDecl;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr singleDecl;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17835,25 +17854,28 @@ public uint GetdeclsCount
 
             public unsafe partial class NullStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal semiLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal byte hasLeadingEmptyMacro;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17947,40 +17969,43 @@ public bool HasLeadingEmptyMacro
 
             public unsafe partial class CompoundStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_N___1_S_allocator__S0_ body;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte body_empty;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal uint size;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr body_front;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr body_back;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBracLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18210,28 +18235,31 @@ public uint GetbodyCount
 
             public unsafe partial class SwitchCase : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18241,8 +18269,8 @@ public unsafe partial class SwitchCase : global::CppSharp.Parser.AST.Stmt, IDisp
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST10SwitchCaseC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST10SwitchCaseC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -18292,7 +18320,7 @@ public SwitchCase()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public SwitchCase(global::CppSharp.Parser.AST.StmtClass klass)
+                public SwitchCase(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.SwitchCase.__Internal));
@@ -18310,7 +18338,7 @@ public SwitchCase(global::CppSharp.Parser.AST.SwitchCase _0)
                     *((global::CppSharp.Parser.AST.SwitchCase.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.SwitchCase.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.SwitchCase(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.SwitchCase(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.SwitchCase(klass);
                 }
@@ -18362,43 +18390,46 @@ public SwitchCase(global::CppSharp.Parser.AST.SwitchCase _0)
 
             public unsafe partial class CaseStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal caseLoc;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal byte caseStmtIsGNURange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18541,31 +18572,34 @@ public bool CaseStmtIsGNURange
 
             public unsafe partial class DefaultStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal defaultLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18646,28 +18680,31 @@ public DefaultStmt(global::CppSharp.Parser.AST.DefaultStmt _0)
 
             public unsafe partial class LabelStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal identLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr subStmt;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal identLoc;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr subStmt;
+
+                    [FieldOffset(48)]
                     internal global::System.IntPtr name;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18779,25 +18816,28 @@ public string Name
 
             public unsafe partial class AttributedStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal attrLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal attrLoc;
+
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18896,55 +18936,58 @@ public AttributedStmt(global::CppSharp.Parser.AST.AttributedStmt _0)
 
             public unsafe partial class IfStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr then;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr _else;
+                    internal global::System.IntPtr then;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr _else;
 
                     [FieldOffset(56)]
+                    internal global::System.IntPtr init;
+
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ifLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal elseLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal byte _constexpr;
 
-                    [FieldOffset(65)]
+                    [FieldOffset(73)]
                     internal byte hasInitStorage;
 
-                    [FieldOffset(66)]
+                    [FieldOffset(74)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(67)]
+                    [FieldOffset(75)]
                     internal byte hasElseStorage;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte isObjCAvailabilityCheck;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19193,43 +19236,46 @@ public bool IsObjCAvailabilityCheck
 
             public unsafe partial class SwitchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(48)]
+                    internal global::System.IntPtr init;
+
+                    [FieldOffset(56)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal switchLoc;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte hasInitStorage;
 
-                    [FieldOffset(53)]
+                    [FieldOffset(61)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal byte isAllEnumCasesCovered;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19421,34 +19467,37 @@ public bool IsAllEnumCasesCovered
 
             public unsafe partial class WhileStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr body;
+
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19596,34 +19645,37 @@ public bool HasVarStorage
 
             public unsafe partial class DoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr body;
+
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal doLoc;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19766,43 +19818,46 @@ public DoStmt(global::CppSharp.Parser.AST.DoStmt _0)
 
             public unsafe partial class ForStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr inc;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr inc;
 
                     [FieldOffset(56)]
+                    internal global::System.IntPtr body;
+
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19999,25 +20054,28 @@ public ForStmt(global::CppSharp.Parser.AST.ForStmt _0)
 
             public unsafe partial class GotoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal labelLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20111,28 +20169,31 @@ public GotoStmt(global::CppSharp.Parser.AST.GotoStmt _0)
 
             public unsafe partial class IndirectGotoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal starLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr target;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20244,22 +20305,25 @@ public IndirectGotoStmt(global::CppSharp.Parser.AST.IndirectGotoStmt _0)
 
             public unsafe partial class ContinueStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal continueLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20340,22 +20404,25 @@ public ContinueStmt(global::CppSharp.Parser.AST.ContinueStmt _0)
 
             public unsafe partial class BreakStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal breakLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20436,25 +20503,28 @@ public BreakStmt(global::CppSharp.Parser.AST.BreakStmt _0)
 
             public unsafe partial class ReturnStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr retValue;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::System.IntPtr retValue;
+
+                    [FieldOffset(40)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal returnLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20553,46 +20623,49 @@ public ReturnStmt(global::CppSharp.Parser.AST.ReturnStmt _0)
 
             public unsafe partial class AsmStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ inputs;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ outputs;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal byte simple;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(85)]
                     internal byte _volatile;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numOutputs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numInputs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numClobbers;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20602,8 +20675,8 @@ public unsafe partial class AsmStmt : global::CppSharp.Parser.AST.Stmt, IDisposa
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST7AsmStmtC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST7AsmStmtC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -20698,7 +20771,7 @@ public AsmStmt()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public AsmStmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public AsmStmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.AsmStmt.__Internal));
@@ -20780,7 +20853,7 @@ public void Clearoutputs()
                     __Internal.Clearoutputs((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.AsmStmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.AsmStmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.AsmStmt(klass);
                 }
@@ -20897,49 +20970,52 @@ public uint GetoutputsCount
 
             public unsafe partial class GCCAsmStmt : global::CppSharp.Parser.AST.AsmStmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ inputs;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ outputs;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal byte simple;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(85)]
                     internal byte _volatile;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numOutputs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numInputs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numClobbers;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21228,58 +21304,61 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class MSAsmStmt : global::CppSharp.Parser.AST.AsmStmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ inputs;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ outputs;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal byte simple;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(85)]
                     internal byte _volatile;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numOutputs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numInputs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numClobbers;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBraceLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte hasBraces;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numAsmToks;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C asmString;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21423,28 +21502,31 @@ public string AsmString
 
             public unsafe partial class SEHExceptStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal exceptLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr filterExpr;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal exceptLoc;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr filterExpr;
+
+                    [FieldOffset(48)]
                     internal global::System.IntPtr block;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21561,25 +21643,28 @@ public SEHExceptStmt(global::CppSharp.Parser.AST.SEHExceptStmt _0)
 
             public unsafe partial class SEHFinallyStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal finallyLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal finallyLoc;
+
+                    [FieldOffset(40)]
                     internal global::System.IntPtr block;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21678,37 +21763,40 @@ public SEHFinallyStmt(global::CppSharp.Parser.AST.SEHFinallyStmt _0)
 
             public unsafe partial class SEHTryStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal byte isCXXTry;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr tryBlock;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr handler;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr exceptHandler;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr finallyHandler;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21874,22 +21962,25 @@ public bool IsCXXTry
 
             public unsafe partial class SEHLeaveStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal leaveLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21970,28 +22061,31 @@ public SEHLeaveStmt(global::CppSharp.Parser.AST.SEHLeaveStmt _0)
 
             public unsafe partial class CapturedStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ capture_inits;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr capturedStmt;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal uint capture_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22356,28 +22450,31 @@ public uint GetcaptureInitsCount
 
             public unsafe partial class CXXCatchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal catchLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal catchLoc;
+
+                    [FieldOffset(40)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal caughtType;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr handlerBlock;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22489,28 +22586,31 @@ public CXXCatchStmt(global::CppSharp.Parser.AST.CXXCatchStmt _0)
 
             public unsafe partial class CXXTryStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr tryBlock;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr tryBlock;
+
+                    [FieldOffset(48)]
                     internal uint numHandlers;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22622,58 +22722,61 @@ public uint NumHandlers
 
             public unsafe partial class CXXForRangeStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr rangeInit;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr rangeInit;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr inc;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(56)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr inc;
 
                     [FieldOffset(64)]
-                    internal global::System.IntPtr rangeStmt;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(72)]
-                    internal global::System.IntPtr beginStmt;
+                    internal global::System.IntPtr rangeStmt;
 
                     [FieldOffset(80)]
-                    internal global::System.IntPtr endStmt;
+                    internal global::System.IntPtr beginStmt;
 
                     [FieldOffset(88)]
-                    internal global::System.IntPtr loopVarStmt;
+                    internal global::System.IntPtr endStmt;
 
                     [FieldOffset(96)]
+                    internal global::System.IntPtr loopVarStmt;
+
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal coawaitLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22955,31 +23058,34 @@ public CXXForRangeStmt(global::CppSharp.Parser.AST.CXXForRangeStmt _0)
 
             public unsafe partial class MSDependentExistsStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal byte isIfExists;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(37)]
                     internal byte isIfNotExists;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23104,58 +23210,61 @@ public bool IsIfNotExists
 
             public unsafe partial class CoroutineBodyStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal byte hasDependentPromiseType;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal byte hasDependentPromiseType;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr promiseDeclStmt;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr initSuspendStmt;
+                    internal global::System.IntPtr promiseDeclStmt;
 
                     [FieldOffset(56)]
-                    internal global::System.IntPtr finalSuspendStmt;
+                    internal global::System.IntPtr initSuspendStmt;
 
                     [FieldOffset(64)]
-                    internal global::System.IntPtr exceptionHandler;
+                    internal global::System.IntPtr finalSuspendStmt;
 
                     [FieldOffset(72)]
-                    internal global::System.IntPtr fallthroughHandler;
+                    internal global::System.IntPtr exceptionHandler;
 
                     [FieldOffset(80)]
-                    internal global::System.IntPtr allocate;
+                    internal global::System.IntPtr fallthroughHandler;
 
                     [FieldOffset(88)]
-                    internal global::System.IntPtr deallocate;
+                    internal global::System.IntPtr allocate;
 
                     [FieldOffset(96)]
-                    internal global::System.IntPtr returnValueInit;
+                    internal global::System.IntPtr deallocate;
 
                     [FieldOffset(104)]
-                    internal global::System.IntPtr resultDecl;
+                    internal global::System.IntPtr returnValueInit;
 
                     [FieldOffset(112)]
-                    internal global::System.IntPtr returnStmt;
+                    internal global::System.IntPtr resultDecl;
 
                     [FieldOffset(120)]
+                    internal global::System.IntPtr returnStmt;
+
+                    [FieldOffset(128)]
                     internal global::System.IntPtr returnStmtOnAllocFailure;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23557,31 +23666,34 @@ public bool HasDependentPromiseType
 
             public unsafe partial class CoreturnStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal byte isImplicit;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr promiseCall;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23911,61 +24023,64 @@ public enum UnaryExprOrTypeTrait
 
             public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23975,8 +24090,8 @@ public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST4ExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST4ExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -24337,7 +24452,7 @@ public Expr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public Expr(global::CppSharp.Parser.AST.StmtClass klass)
+                public Expr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.Expr.__Internal));
@@ -24355,7 +24470,7 @@ public Expr(global::CppSharp.Parser.AST.Expr _0)
                     *((global::CppSharp.Parser.AST.Expr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.Expr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.Expr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.Expr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.Expr(klass);
                 }
@@ -24555,64 +24670,67 @@ public bool HasPlaceholderType
 
             public unsafe partial class FullExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -24622,8 +24740,8 @@ public unsafe partial class FullExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST8FullExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST8FullExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -24673,7 +24791,7 @@ public FullExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public FullExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public FullExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.FullExpr.__Internal));
@@ -24691,7 +24809,7 @@ public FullExpr(global::CppSharp.Parser.AST.FullExpr _0)
                     *((global::CppSharp.Parser.AST.FullExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.FullExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.FullExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.FullExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.FullExpr(klass);
                 }
@@ -24717,64 +24835,67 @@ public FullExpr(global::CppSharp.Parser.AST.FullExpr _0)
 
             public unsafe partial class ConstantExpr : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -24842,70 +24963,73 @@ public ConstantExpr(global::CppSharp.Parser.AST.ConstantExpr _0)
 
             public unsafe partial class OpaqueValueExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte isUnique;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr sourceExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25017,97 +25141,100 @@ public bool IsUnique
 
             public unsafe partial class DeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(81)]
+                    [FieldOffset(89)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr foundDecl;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hasTemplateKWAndArgsInfo;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(113)]
+                    [FieldOffset(121)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte refersToEnclosingVariableOrCapture;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25336,67 +25463,70 @@ public bool RefersToEnclosingVariableOrCapture
 
             public unsafe partial class IntegerLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal ulong value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25490,67 +25620,70 @@ public ulong Value
 
             public unsafe partial class FixedPointLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal ulong value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25644,70 +25777,73 @@ public ulong Value
 
             public unsafe partial class CharacterLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.CharacterLiteral.CharacterKind kind;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25823,70 +25959,73 @@ public uint Value
 
             public unsafe partial class FloatingLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte exact;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal double valueAsApproximateDouble;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25993,64 +26132,67 @@ public double ValueAsApproximateDouble
 
             public unsafe partial class ImaginaryLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26136,106 +26278,109 @@ public ImaginaryLiteral(global::CppSharp.Parser.AST.ImaginaryLiteral _0)
 
             public unsafe partial class StringLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C bytes;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal uint byteLength;
 
-                    [FieldOffset(132)]
+                    [FieldOffset(140)]
                     internal uint length;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint charByteWidth;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal global::CppSharp.Parser.AST.StringLiteral.StringKind kind;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal byte isAscii;
 
-                    [FieldOffset(145)]
+                    [FieldOffset(153)]
                     internal byte isWide;
 
-                    [FieldOffset(146)]
+                    [FieldOffset(154)]
                     internal byte isUTF8;
 
-                    [FieldOffset(147)]
+                    [FieldOffset(155)]
                     internal byte isUTF16;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isUTF32;
 
-                    [FieldOffset(149)]
+                    [FieldOffset(157)]
                     internal byte isPascal;
 
-                    [FieldOffset(150)]
+                    [FieldOffset(158)]
                     internal byte containsNonAscii;
 
-                    [FieldOffset(151)]
+                    [FieldOffset(159)]
                     internal byte containsNonAsciiOrNull;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal uint numConcatenated;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26534,67 +26679,70 @@ public uint NumConcatenated
 
             public unsafe partial class PredefinedExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.PredefinedExpr.IdentKind identKind;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26700,70 +26848,73 @@ public PredefinedExpr(global::CppSharp.Parser.AST.PredefinedExpr _0)
 
             public unsafe partial class ParenExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParen;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParen;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26875,91 +27026,94 @@ public ParenExpr(global::CppSharp.Parser.AST.ParenExpr _0)
 
             public unsafe partial class UnaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.UnaryOperatorKind opcode;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte canOverflow;
 
-                    [FieldOffset(93)]
+                    [FieldOffset(101)]
                     internal byte isPrefix;
 
-                    [FieldOffset(94)]
+                    [FieldOffset(102)]
                     internal byte isPostfix;
 
-                    [FieldOffset(95)]
+                    [FieldOffset(103)]
                     internal byte isIncrementOp;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte isDecrementOp;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte isIncrementDecrementOp;
 
-                    [FieldOffset(98)]
+                    [FieldOffset(106)]
                     internal byte isArithmeticOp;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27162,73 +27316,76 @@ public bool IsArithmeticOp
 
             public unsafe partial class OffsetOfExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numComponents;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numExpressions;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27348,82 +27505,85 @@ public uint NumExpressions
 
             public unsafe partial class UnaryExprOrTypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.UnaryExprOrTypeTrait kind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte isArgumentType;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal argumentType;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr argumentExpr;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeOfArgument;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27587,76 +27747,79 @@ public bool IsArgumentType
 
             public unsafe partial class ArraySubscriptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracketLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr idx;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27809,88 +27972,91 @@ public ArraySubscriptExpr(global::CppSharp.Parser.AST.ArraySubscriptExpr _0)
 
             public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27900,8 +28066,8 @@ public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST8CallExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST8CallExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -27976,7 +28142,7 @@ public CallExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CallExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CallExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CallExpr.__Internal));
@@ -28034,7 +28200,7 @@ public void Cleararguments()
                     __Internal.Cleararguments((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CallExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CallExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CallExpr(klass);
                 }
@@ -28170,100 +28336,103 @@ public uint GetargumentsCount
 
             public unsafe partial class MemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte arrow;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(113)]
+                    [FieldOffset(121)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal byte isImplicitAccess;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28505,70 +28674,73 @@ public bool IsImplicitAccess
 
             public unsafe partial class CompoundLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr initializer;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte fileScope;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28680,82 +28852,85 @@ public bool FileScope
 
             public unsafe partial class CastExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28765,8 +28940,8 @@ public unsafe partial class CastExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST8CastExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST8CastExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -28816,7 +28991,7 @@ public CastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CastExpr.__Internal));
@@ -28834,7 +29009,7 @@ public CastExpr(global::CppSharp.Parser.AST.CastExpr _0)
                     *((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CastExpr(klass);
                 }
@@ -28948,85 +29123,88 @@ public uint PathSize
 
             public unsafe partial class ImplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte isPartOfExplicitCast;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29112,85 +29290,88 @@ public bool IsPartOfExplicitCast
 
             public unsafe partial class ExplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29200,8 +29381,8 @@ public unsafe partial class ExplicitCastExpr : global::CppSharp.Parser.AST.CastE
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST16ExplicitCastExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST16ExplicitCastExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -29251,7 +29432,7 @@ public ExplicitCastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public ExplicitCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public ExplicitCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal));
@@ -29269,7 +29450,7 @@ public ExplicitCastExpr(global::CppSharp.Parser.AST.ExplicitCastExpr _0)
                     *((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.ExplicitCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.ExplicitCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.ExplicitCastExpr(klass);
                 }
@@ -29290,91 +29471,94 @@ public ExplicitCastExpr(global::CppSharp.Parser.AST.ExplicitCastExpr _0)
 
             public unsafe partial class CStyleCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 144)]
+                [StructLayout(LayoutKind.Explicit, Size = 152)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29468,118 +29652,121 @@ public CStyleCastExpr(global::CppSharp.Parser.AST.CStyleCastExpr _0)
 
             public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 144)]
+                [StructLayout(LayoutKind.Explicit, Size = 152)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind opcode;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C opcodeStr;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isPtrMemOp;
 
-                    [FieldOffset(129)]
+                    [FieldOffset(137)]
                     internal byte isMultiplicativeOp;
 
-                    [FieldOffset(130)]
+                    [FieldOffset(138)]
                     internal byte isAdditiveOp;
 
-                    [FieldOffset(131)]
+                    [FieldOffset(139)]
                     internal byte isShiftOp;
 
-                    [FieldOffset(132)]
+                    [FieldOffset(140)]
                     internal byte isBitwiseOp;
 
-                    [FieldOffset(133)]
+                    [FieldOffset(141)]
                     internal byte isRelationalOp;
 
-                    [FieldOffset(134)]
+                    [FieldOffset(142)]
                     internal byte isEqualityOp;
 
-                    [FieldOffset(135)]
+                    [FieldOffset(143)]
                     internal byte isComparisonOp;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte isLogicalOp;
 
-                    [FieldOffset(137)]
+                    [FieldOffset(145)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(138)]
+                    [FieldOffset(146)]
                     internal byte isCompoundAssignmentOp;
 
-                    [FieldOffset(139)]
+                    [FieldOffset(147)]
                     internal byte isShiftAssignOp;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal byte isFPContractableWithinStatement;
 
-                    [FieldOffset(141)]
+                    [FieldOffset(149)]
                     internal byte isFEnvAccessOn;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29589,8 +29776,8 @@ public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, I
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST14BinaryOperatorC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST14BinaryOperatorC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -29645,7 +29832,7 @@ public BinaryOperator()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public BinaryOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public BinaryOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.BinaryOperator.__Internal));
@@ -29679,7 +29866,7 @@ public override void Dispose(bool disposing)
                     __Instance = IntPtr.Zero;
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.BinaryOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.BinaryOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.BinaryOperator(klass);
                 }
@@ -29947,124 +30134,127 @@ public bool IsFEnvAccessOn
 
             public unsafe partial class CompoundAssignOperator : global::CppSharp.Parser.AST.BinaryOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 184)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind opcode;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C opcodeStr;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isPtrMemOp;
 
-                    [FieldOffset(129)]
+                    [FieldOffset(137)]
                     internal byte isMultiplicativeOp;
 
-                    [FieldOffset(130)]
+                    [FieldOffset(138)]
                     internal byte isAdditiveOp;
 
-                    [FieldOffset(131)]
+                    [FieldOffset(139)]
                     internal byte isShiftOp;
 
-                    [FieldOffset(132)]
+                    [FieldOffset(140)]
                     internal byte isBitwiseOp;
 
-                    [FieldOffset(133)]
+                    [FieldOffset(141)]
                     internal byte isRelationalOp;
 
-                    [FieldOffset(134)]
+                    [FieldOffset(142)]
                     internal byte isEqualityOp;
 
-                    [FieldOffset(135)]
+                    [FieldOffset(143)]
                     internal byte isComparisonOp;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte isLogicalOp;
 
-                    [FieldOffset(137)]
+                    [FieldOffset(145)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(138)]
+                    [FieldOffset(146)]
                     internal byte isCompoundAssignmentOp;
 
-                    [FieldOffset(139)]
+                    [FieldOffset(147)]
                     internal byte isShiftAssignOp;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal byte isFPContractableWithinStatement;
 
-                    [FieldOffset(141)]
+                    [FieldOffset(149)]
                     internal byte isFEnvAccessOn;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal computationLHSType;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal computationResultType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30179,76 +30369,79 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class AbstractConditionalOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30258,8 +30451,8 @@ public unsafe partial class AbstractConditionalOperator : global::CppSharp.Parse
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST27AbstractConditionalOperatorC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST27AbstractConditionalOperatorC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -30309,7 +30502,7 @@ public AbstractConditionalOperator()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public AbstractConditionalOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public AbstractConditionalOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal));
@@ -30327,7 +30520,7 @@ public AbstractConditionalOperator(global::CppSharp.Parser.AST.AbstractCondition
                     *((global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.AbstractConditionalOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.AbstractConditionalOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.AbstractConditionalOperator(klass);
                 }
@@ -30415,82 +30608,85 @@ public AbstractConditionalOperator(global::CppSharp.Parser.AST.AbstractCondition
 
             public unsafe partial class ConditionalOperator : global::CppSharp.Parser.AST.AbstractConditionalOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr rHS;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30594,82 +30790,85 @@ public ConditionalOperator(global::CppSharp.Parser.AST.ConditionalOperator _0)
 
             public unsafe partial class BinaryConditionalOperator : global::CppSharp.Parser.AST.AbstractConditionalOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr common;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr opaqueValue;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30773,67 +30972,70 @@ public BinaryConditionalOperator(global::CppSharp.Parser.AST.BinaryConditionalOp
 
             public unsafe partial class AddrLabelExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ampAmpLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal labelLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30927,70 +31129,73 @@ public AddrLabelExpr(global::CppSharp.Parser.AST.AddrLabelExpr _0)
 
             public unsafe partial class StmtExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subStmt;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31102,70 +31307,73 @@ public StmtExpr(global::CppSharp.Parser.AST.StmtExpr _0)
 
             public unsafe partial class ShuffleVectorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numSubExprs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31272,70 +31480,73 @@ public uint NumSubExprs
 
             public unsafe partial class ConvertVectorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr srcExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31447,85 +31658,88 @@ public ConvertVectorExpr(global::CppSharp.Parser.AST.ConvertVectorExpr _0)
 
             public unsafe partial class ChooseExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte isConditionTrue;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte isConditionDependent;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr chosenSubExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31717,64 +31931,67 @@ public bool IsConditionDependent
 
             public unsafe partial class GNUNullExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tokenLocation;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31855,73 +32072,76 @@ public GNUNullExpr(global::CppSharp.Parser.AST.GNUNullExpr _0)
 
             public unsafe partial class VAArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte isMicrosoftABI;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -32046,97 +32266,100 @@ public bool IsMicrosoftABI
 
             public unsafe partial class InitListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr arrayFiller;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBraceLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBraceLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr syntacticForm;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numInits;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal byte hasArrayFiller;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(117)]
                     internal byte isExplicit;
 
-                    [FieldOffset(110)]
+                    [FieldOffset(118)]
                     internal byte isStringLiteralInit;
 
-                    [FieldOffset(111)]
+                    [FieldOffset(119)]
                     internal byte isTransparent;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte isSemanticForm;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr semanticForm;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isSyntacticForm;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -32375,79 +32598,82 @@ public bool IsSyntacticForm
 
             public unsafe partial class DesignatedInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal equalOrColonLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr init;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint size;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte usesGNUSyntax;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal uint numSubExprs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceRange.__Internal designatorsSourceRange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33043,61 +33269,64 @@ public uint NumSubExprs
 
             public unsafe partial class NoInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33165,67 +33394,70 @@ public NoInitExpr(global::CppSharp.Parser.AST.NoInitExpr _0)
 
             public unsafe partial class DesignatedInitUpdateExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr updater;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33329,67 +33561,70 @@ public DesignatedInitUpdateExpr(global::CppSharp.Parser.AST.DesignatedInitUpdate
 
             public unsafe partial class ArrayInitLoopExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33493,61 +33728,64 @@ public ArrayInitLoopExpr(global::CppSharp.Parser.AST.ArrayInitLoopExpr _0)
 
             public unsafe partial class ArrayInitIndexExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33615,61 +33853,64 @@ public ArrayInitIndexExpr(global::CppSharp.Parser.AST.ArrayInitIndexExpr _0)
 
             public unsafe partial class ImplicitValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33737,70 +33978,73 @@ public ImplicitValueInitExpr(global::CppSharp.Parser.AST.ImplicitValueInitExpr _
 
             public unsafe partial class ParenListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numExprs;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33907,85 +34151,88 @@ public uint NumExprs
 
             public unsafe partial class GenericSelectionExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numAssocs;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal genericLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal defaultLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr controllingExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal byte isResultDependent;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal uint resultIndex;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr resultExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34167,76 +34414,79 @@ public uint ResultIndex
 
             public unsafe partial class ExtVectorElementExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal accessorLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numElements;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte containsDuplicateElements;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte isArrow;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34374,67 +34624,70 @@ public bool IsArrow
 
             public unsafe partial class BlockExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal caretLocation;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr body;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34533,70 +34786,73 @@ public BlockExpr(global::CppSharp.Parser.AST.BlockExpr _0)
 
             public unsafe partial class AsTypeExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr srcExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34708,73 +34964,76 @@ public AsTypeExpr(global::CppSharp.Parser.AST.AsTypeExpr _0)
 
             public unsafe partial class PseudoObjectExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr syntacticForm;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint resultExprIndex;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr resultExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numSemanticExprs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34904,106 +35163,109 @@ public uint NumSemanticExprs
 
             public unsafe partial class AtomicExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 184)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr ptr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr order;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr scope;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr val1;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr orderFail;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr val2;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr weak;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal valueType;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.AtomicExpr.AtomicOp op;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal uint numSubExprs;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal byte isVolatile;
 
-                    [FieldOffset(161)]
+                    [FieldOffset(169)]
                     internal byte isCmpXChg;
 
-                    [FieldOffset(162)]
+                    [FieldOffset(170)]
                     internal byte isOpenCL;
 
-                    [FieldOffset(164)]
+                    [FieldOffset(172)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35351,61 +35613,64 @@ public bool IsOpenCL
 
             public unsafe partial class TypoExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35473,103 +35738,106 @@ public TypoExpr(global::CppSharp.Parser.AST.TypoExpr _0)
 
             public unsafe partial class CXXOperatorCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.OverloadedOperatorKind _operator;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(157)]
+                    [FieldOffset(165)]
                     internal byte isInfixBinaryOp;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(164)]
+                    [FieldOffset(172)]
                     internal byte isFPContractableWithinStatement;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35723,94 +35991,97 @@ public bool IsFPContractableWithinStatement
 
             public unsafe partial class CXXMemberCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::System.IntPtr implicitObjectArgument;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::System.IntPtr methodDecl;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35935,91 +36206,94 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CUDAKernelCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::System.IntPtr config;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36126,97 +36400,100 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CXXNamedCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36226,8 +36503,8 @@ public unsafe partial class CXXNamedCastExpr : global::CppSharp.Parser.AST.Expli
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXNamedCastExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXNamedCastExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -36277,7 +36554,7 @@ public CXXNamedCastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CXXNamedCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CXXNamedCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal));
@@ -36295,7 +36572,7 @@ public CXXNamedCastExpr(global::CppSharp.Parser.AST.CXXNamedCastExpr _0)
                     *((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CXXNamedCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CXXNamedCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CXXNamedCastExpr(klass);
                 }
@@ -36355,97 +36632,100 @@ public string CastName
 
             public unsafe partial class CXXStaticCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36513,100 +36793,103 @@ public CXXStaticCastExpr(global::CppSharp.Parser.AST.CXXStaticCastExpr _0)
 
             public unsafe partial class CXXDynamicCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal byte isAlwaysNull;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36687,97 +36970,100 @@ public bool IsAlwaysNull
 
             public unsafe partial class CXXReinterpretCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36845,97 +37131,100 @@ public CXXReinterpretCastExpr(global::CppSharp.Parser.AST.CXXReinterpretCastExpr
 
             public unsafe partial class CXXConstCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37003,97 +37292,100 @@ public CXXConstCastExpr(global::CppSharp.Parser.AST.CXXConstCastExpr _0)
 
             public unsafe partial class UserDefinedLiteral : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 184)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.UserDefinedLiteral.LiteralOperatorKind literalOperatorKind;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::System.IntPtr cookedLiteral;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal uDSuffixLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37236,67 +37528,70 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CXXBoolLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte value;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37390,64 +37685,67 @@ public bool Value
 
             public unsafe partial class CXXNullPtrLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37528,64 +37826,67 @@ public CXXNullPtrLiteralExpr(global::CppSharp.Parser.AST.CXXNullPtrLiteralExpr _
 
             public unsafe partial class CXXStdInitializerListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
-                    internal global::System.IntPtr sourceBitField;
-
                     [FieldOffset(64)]
-                    internal global::System.IntPtr referencedDeclOfCallee;
+                    internal global::System.IntPtr sourceBitField;
 
                     [FieldOffset(72)]
-                    internal byte hasPlaceholderType;
+                    internal global::System.IntPtr referencedDeclOfCallee;
 
                     [FieldOffset(80)]
+                    internal byte hasPlaceholderType;
+
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37671,70 +37972,73 @@ public CXXStdInitializerListExpr(global::CppSharp.Parser.AST.CXXStdInitializerLi
 
             public unsafe partial class CXXTypeidExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr exprOperand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte isPotentiallyEvaluated;
 
-                    [FieldOffset(89)]
+                    [FieldOffset(97)]
                     internal byte isTypeOperand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37846,73 +38150,76 @@ public bool IsTypeOperand
 
             public unsafe partial class MSPropertyRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr baseExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte isArrow;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38037,70 +38344,73 @@ public bool IsArrow
 
             public unsafe partial class MSPropertySubscriptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracketLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr idx;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38217,70 +38527,73 @@ public MSPropertySubscriptExpr(global::CppSharp.Parser.AST.MSPropertySubscriptEx
 
             public unsafe partial class CXXUuidofExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr exprOperand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C uuidStr;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte isTypeOperand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38416,67 +38729,70 @@ public bool IsTypeOperand
 
             public unsafe partial class CXXThisExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte @implicit;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38570,70 +38886,73 @@ public bool Implicit
 
             public unsafe partial class CXXThrowExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal throwLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte isThrownVariableInScope;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38745,67 +39064,70 @@ public bool IsThrownVariableInScope
 
             public unsafe partial class CXXDefaultArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr expr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal usedLocation;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38904,67 +39226,70 @@ public CXXDefaultArgExpr(global::CppSharp.Parser.AST.CXXDefaultArgExpr _0)
 
             public unsafe partial class CXXDefaultInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr field;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr expr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39068,64 +39393,67 @@ public CXXDefaultInitExpr(global::CppSharp.Parser.AST.CXXDefaultInitExpr _0)
 
             public unsafe partial class CXXBindTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39211,88 +39539,91 @@ public CXXBindTemporaryExpr(global::CppSharp.Parser.AST.CXXBindTemporaryExpr _0)
 
             public unsafe partial class CXXConstructExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal byte elidable;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(117)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(110)]
+                    [FieldOffset(118)]
                     internal byte listInitialization;
 
-                    [FieldOffset(111)]
+                    [FieldOffset(119)]
                     internal byte stdInitListInitialization;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte requiresZeroInitialization;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal global::CppSharp.Parser.SourceRange.__Internal parenOrBraceRange;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39302,8 +39633,8 @@ public unsafe partial class CXXConstructExpr : global::CppSharp.Parser.AST.Expr,
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXConstructExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXConstructExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -39386,7 +39717,7 @@ public CXXConstructExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CXXConstructExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CXXConstructExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CXXConstructExpr.__Internal));
@@ -39444,7 +39775,7 @@ public void Cleararguments()
                     __Internal.Cleararguments((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CXXConstructExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CXXConstructExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CXXConstructExpr(klass);
                 }
@@ -39565,70 +39896,73 @@ public uint GetargumentsCount
 
             public unsafe partial class CXXInheritedCtorInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte constructsVBase;
 
-                    [FieldOffset(74)]
+                    [FieldOffset(82)]
                     internal byte inheritedFromVBase;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39735,94 +40069,97 @@ public bool InheritedFromVBase
 
             public unsafe partial class CXXFunctionalCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal byte isListInitialization;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39929,88 +40266,91 @@ public bool IsListInitialization
 
             public unsafe partial class CXXTemporaryObjectExpr : global::CppSharp.Parser.AST.CXXConstructExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal byte elidable;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(117)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(110)]
+                    [FieldOffset(118)]
                     internal byte listInitialization;
 
-                    [FieldOffset(111)]
+                    [FieldOffset(119)]
                     internal byte stdInitListInitialization;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte requiresZeroInitialization;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal global::CppSharp.Parser.SourceRange.__Internal parenOrBraceRange;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40099,91 +40439,94 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class LambdaExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ capture_inits;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal captureDefaultLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal uint capture_size;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceRange.__Internal introducerRange;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr callOperator;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isGenericLambda;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr body;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal byte isMutable;
 
-                    [FieldOffset(145)]
+                    [FieldOffset(153)]
                     internal byte hasExplicitParameters;
 
-                    [FieldOffset(146)]
+                    [FieldOffset(154)]
                     internal byte hasExplicitResultType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40452,64 +40795,67 @@ public uint GetcaptureInitsCount
 
             public unsafe partial class CXXScalarValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40590,106 +40936,109 @@ public CXXScalarValueInitExpr(global::CppSharp.Parser.AST.CXXScalarValueInitExpr
 
             public unsafe partial class CXXNewExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 200)]
+                [StructLayout(LayoutKind.Explicit, Size = 208)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ placement_arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr operatorNew;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr operatorDelete;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal allocatedType;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte isArray;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::System.IntPtr arraySize;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal uint numPlacementArgs;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal byte isParenTypeId;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::CppSharp.Parser.SourceRange.__Internal typeIdParens;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal byte isGlobalNew;
 
-                    [FieldOffset(169)]
+                    [FieldOffset(177)]
                     internal byte hasInitializer;
 
-                    [FieldOffset(172)]
+                    [FieldOffset(180)]
                     internal global::CppSharp.Parser.AST.CXXNewExpr.InitializationStyle initializationStyle;
 
-                    [FieldOffset(176)]
+                    [FieldOffset(184)]
                     internal global::System.IntPtr initializer;
 
-                    [FieldOffset(184)]
+                    [FieldOffset(192)]
                     internal global::System.IntPtr constructExpr;
 
-                    [FieldOffset(192)]
+                    [FieldOffset(200)]
                     internal global::CppSharp.Parser.SourceRange.__Internal directInitRange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41045,79 +41394,82 @@ public uint GetplacementArgumentsCount
 
             public unsafe partial class CXXDeleteExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte isGlobalDelete;
 
-                    [FieldOffset(74)]
+                    [FieldOffset(82)]
                     internal byte isArrayForm;
 
-                    [FieldOffset(75)]
+                    [FieldOffset(83)]
                     internal byte isArrayFormAsWritten;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr operatorDelete;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr argument;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal destroyedType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41273,85 +41625,88 @@ public bool IsArrayFormAsWritten
 
             public unsafe partial class CXXPseudoDestructorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(89)]
+                    [FieldOffset(97)]
                     internal byte isArrow;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonColonLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tildeLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal destroyedType;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal destroyedTypeLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41528,67 +41883,70 @@ public bool IsArrow
 
             public unsafe partial class TypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte value;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41682,70 +42040,73 @@ public uint NumArgs
 
             public unsafe partial class ArrayTypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal queriedType;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal ulong value;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr dimensionExpression;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41857,67 +42218,70 @@ public ulong Value
 
             public unsafe partial class ExpressionTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr queriedExpression;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42016,85 +42380,88 @@ public bool Value
 
             public unsafe partial class OverloadExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numDecls;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42104,8 +42471,8 @@ public unsafe partial class OverloadExpr : global::CppSharp.Parser.AST.Expr, IDi
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST12OverloadExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST12OverloadExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -42243,7 +42610,7 @@ public OverloadExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public OverloadExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public OverloadExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.OverloadExpr.__Internal));
@@ -42261,7 +42628,7 @@ public OverloadExpr(global::CppSharp.Parser.AST.OverloadExpr _0)
                     *((global::CppSharp.Parser.AST.OverloadExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.OverloadExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.OverloadExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.OverloadExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.OverloadExpr(klass);
                 }
@@ -42373,91 +42740,94 @@ public uint NumTemplateArgs
 
             public unsafe partial class UnresolvedLookupExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numDecls;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal byte requiresADL;
 
-                    [FieldOffset(105)]
+                    [FieldOffset(113)]
                     internal byte isOverloaded;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42551,82 +42921,85 @@ public bool IsOverloaded
 
             public unsafe partial class DependentScopeDeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(93)]
+                    [FieldOffset(101)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42785,70 +43158,73 @@ public uint NumTemplateArgs
 
             public unsafe partial class ExprWithCleanups : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numObjects;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte cleanupsHaveSideEffects;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42942,79 +43318,82 @@ public bool CleanupsHaveSideEffects
 
             public unsafe partial class CXXUnresolvedConstructExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isListInitialization;
 
-                    [FieldOffset(132)]
+                    [FieldOffset(140)]
                     internal uint arg_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43221,100 +43600,103 @@ public uint GetargumentsCount
 
             public unsafe partial class CXXDependentScopeMemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 144)]
+                [StructLayout(LayoutKind.Explicit, Size = 152)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal baseType;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal byte isArrow;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr firstQualifierFoundInScope;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(132)]
+                    [FieldOffset(140)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(137)]
+                    [FieldOffset(145)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43561,106 +43943,109 @@ public uint NumTemplateArgs
 
             public unsafe partial class UnresolvedMemberExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numDecls;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal baseType;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte hasUnresolvedUsing;
 
-                    [FieldOffset(137)]
+                    [FieldOffset(145)]
                     internal byte isArrow;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43824,67 +44209,70 @@ public bool IsArrow
 
             public unsafe partial class CXXNoexceptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43983,67 +44371,70 @@ public bool Value
 
             public unsafe partial class PackExpansionExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr pattern;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44142,79 +44533,82 @@ public PackExpansionExpr(global::CppSharp.Parser.AST.PackExpansionExpr _0)
 
             public unsafe partial class SizeOfPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal packLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr pack;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal uint packLength;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte isPartiallySubstituted;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44365,67 +44759,70 @@ public bool IsPartiallySubstituted
 
             public unsafe partial class SubstNonTypeTemplateParmExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr replacement;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44524,67 +44921,70 @@ public SubstNonTypeTemplateParmExpr(global::CppSharp.Parser.AST.SubstNonTypeTemp
 
             public unsafe partial class SubstNonTypeTemplateParmPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal parameterPackLocation;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.TemplateArgument.__Internal argumentPack;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44678,67 +45078,70 @@ public SubstNonTypeTemplateParmPackExpr(global::CppSharp.Parser.AST.SubstNonType
 
             public unsafe partial class FunctionParmPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal parameterPackLocation;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numExpansions;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44832,73 +45235,76 @@ public uint NumExpansions
 
             public unsafe partial class MaterializeTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr temporary;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr TemporaryExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal uint manglingNumber;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte isBoundToLvalueReference;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45116,85 +45522,88 @@ public bool IsBoundToLvalueReference
 
             public unsafe partial class CXXFoldExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte isRightFold;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte isLeftFold;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr pattern;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr init;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind _operator;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45386,79 +45795,82 @@ public bool IsLeftFold
 
             public unsafe partial class CoroutineSuspendExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr resumeExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45468,8 +45880,8 @@ public unsafe partial class CoroutineSuspendExpr : global::CppSharp.Parser.AST.E
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST20CoroutineSuspendExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST20CoroutineSuspendExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -45528,7 +45940,7 @@ public CoroutineSuspendExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CoroutineSuspendExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CoroutineSuspendExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal));
@@ -45546,7 +45958,7 @@ public CoroutineSuspendExpr(global::CppSharp.Parser.AST.CoroutineSuspendExpr _0)
                     *((global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CoroutineSuspendExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CoroutineSuspendExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CoroutineSuspendExpr(klass);
                 }
@@ -45657,85 +46069,88 @@ public CoroutineSuspendExpr(global::CppSharp.Parser.AST.CoroutineSuspendExpr _0)
 
             public unsafe partial class CoawaitExpr : global::CppSharp.Parser.AST.CoroutineSuspendExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr resumeExpr;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte isImplicit;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr operand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45834,70 +46249,73 @@ public bool IsImplicit
 
             public unsafe partial class DependentCoawaitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr operatorCoawaitLookup;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -46014,82 +46432,85 @@ public DependentCoawaitExpr(global::CppSharp.Parser.AST.DependentCoawaitExpr _0)
 
             public unsafe partial class CoyieldExpr : global::CppSharp.Parser.AST.CoroutineSuspendExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr resumeExpr;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr operand;
 
                     [SuppressUnmanagedCodeSecurity]
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
index bfe45a9795..427b5b2550 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
@@ -17334,151 +17334,24 @@ namespace Parser
     {
         namespace AST
         {
-            public enum StmtClass
-            {
-                NoStmt = 0,
-                GCCAsmStmt = 1,
-                MSAsmStmt = 2,
-                AttributedStmt = 3,
-                BreakStmt = 4,
-                CXXCatchStmt = 5,
-                CXXForRangeStmt = 6,
-                CXXTryStmt = 7,
-                CapturedStmt = 8,
-                CompoundStmt = 9,
-                ContinueStmt = 10,
-                CoreturnStmt = 11,
-                CoroutineBodyStmt = 12,
-                DeclStmt = 13,
-                DoStmt = 14,
-                BinaryConditionalOperator = 15,
-                ConditionalOperator = 16,
-                AddrLabelExpr = 17,
-                ArrayInitIndexExpr = 18,
-                ArrayInitLoopExpr = 19,
-                ArraySubscriptExpr = 20,
-                ArrayTypeTraitExpr = 21,
-                AsTypeExpr = 22,
-                AtomicExpr = 23,
-                BinaryOperator = 24,
-                CompoundAssignOperator = 25,
-                BlockExpr = 26,
-                CXXBindTemporaryExpr = 27,
-                CXXBoolLiteralExpr = 28,
-                CXXConstructExpr = 29,
-                CXXTemporaryObjectExpr = 30,
-                CXXDefaultArgExpr = 31,
-                CXXDefaultInitExpr = 32,
-                CXXDeleteExpr = 33,
-                CXXDependentScopeMemberExpr = 34,
-                CXXFoldExpr = 35,
-                CXXInheritedCtorInitExpr = 36,
-                CXXNewExpr = 37,
-                CXXNoexceptExpr = 38,
-                CXXNullPtrLiteralExpr = 39,
-                CXXPseudoDestructorExpr = 40,
-                CXXScalarValueInitExpr = 41,
-                CXXStdInitializerListExpr = 42,
-                CXXThisExpr = 43,
-                CXXThrowExpr = 44,
-                CXXTypeidExpr = 45,
-                CXXUnresolvedConstructExpr = 46,
-                CXXUuidofExpr = 47,
-                CallExpr = 48,
-                CUDAKernelCallExpr = 49,
-                CXXMemberCallExpr = 50,
-                CXXOperatorCallExpr = 51,
-                UserDefinedLiteral = 52,
-                CStyleCastExpr = 53,
-                CXXFunctionalCastExpr = 54,
-                CXXConstCastExpr = 55,
-                CXXDynamicCastExpr = 56,
-                CXXReinterpretCastExpr = 57,
-                CXXStaticCastExpr = 58,
-                ImplicitCastExpr = 60,
-                CharacterLiteral = 61,
-                ChooseExpr = 62,
-                CompoundLiteralExpr = 63,
-                ConvertVectorExpr = 64,
-                CoawaitExpr = 65,
-                CoyieldExpr = 66,
-                DeclRefExpr = 67,
-                DependentCoawaitExpr = 68,
-                DependentScopeDeclRefExpr = 69,
-                DesignatedInitExpr = 70,
-                DesignatedInitUpdateExpr = 71,
-                ExpressionTraitExpr = 72,
-                ExtVectorElementExpr = 73,
-                FixedPointLiteral = 74,
-                FloatingLiteral = 75,
-                ConstantExpr = 76,
-                ExprWithCleanups = 77,
-                FunctionParmPackExpr = 78,
-                GNUNullExpr = 79,
-                GenericSelectionExpr = 80,
-                ImaginaryLiteral = 81,
-                ImplicitValueInitExpr = 82,
-                InitListExpr = 83,
-                IntegerLiteral = 84,
-                LambdaExpr = 85,
-                MSPropertyRefExpr = 86,
-                MSPropertySubscriptExpr = 87,
-                MaterializeTemporaryExpr = 88,
-                MemberExpr = 89,
-                NoInitExpr = 90,
-                OffsetOfExpr = 107,
-                OpaqueValueExpr = 108,
-                UnresolvedLookupExpr = 109,
-                UnresolvedMemberExpr = 110,
-                PackExpansionExpr = 111,
-                ParenExpr = 112,
-                ParenListExpr = 113,
-                PredefinedExpr = 114,
-                PseudoObjectExpr = 115,
-                ShuffleVectorExpr = 116,
-                SizeOfPackExpr = 117,
-                StmtExpr = 118,
-                StringLiteral = 119,
-                SubstNonTypeTemplateParmExpr = 120,
-                SubstNonTypeTemplateParmPackExpr = 121,
-                TypeTraitExpr = 122,
-                TypoExpr = 123,
-                UnaryExprOrTypeTraitExpr = 124,
-                UnaryOperator = 125,
-                VAArgExpr = 126,
-                ForStmt = 127,
-                GotoStmt = 128,
-                IfStmt = 129,
-                IndirectGotoStmt = 130,
-                LabelStmt = 131,
-                MSDependentExistsStmt = 132,
-                NullStmt = 133,
-                ReturnStmt = 188,
-                SEHExceptStmt = 189,
-                SEHFinallyStmt = 190,
-                SEHLeaveStmt = 191,
-                SEHTryStmt = 192,
-                CaseStmt = 193,
-                DefaultStmt = 194,
-                SwitchStmt = 195,
-                WhileStmt = 196
-            }
-
             public unsafe partial class Stmt : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+
+                    [FieldOffset(24)]
                     internal global::System.IntPtr stripLabelLikeStatements;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17488,8 +17361,8 @@ public partial struct __Internal
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST4StmtC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST4StmtC2ENS2_9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -17497,6 +17370,136 @@ public partial struct __Internal
                     internal static extern void cctor(global::System.IntPtr __instance, global::System.IntPtr _0);
                 }
 
+                public enum StmtClass
+                {
+                    NoStmt = 0,
+                    GCCAsmStmt = 1,
+                    MSAsmStmt = 2,
+                    AttributedStmt = 3,
+                    BreakStmt = 4,
+                    CXXCatchStmt = 5,
+                    CXXForRangeStmt = 6,
+                    CXXTryStmt = 7,
+                    CapturedStmt = 8,
+                    CompoundStmt = 9,
+                    ContinueStmt = 10,
+                    CoreturnStmt = 11,
+                    CoroutineBodyStmt = 12,
+                    DeclStmt = 13,
+                    DoStmt = 14,
+                    BinaryConditionalOperator = 15,
+                    ConditionalOperator = 16,
+                    AddrLabelExpr = 17,
+                    ArrayInitIndexExpr = 18,
+                    ArrayInitLoopExpr = 19,
+                    ArraySubscriptExpr = 20,
+                    ArrayTypeTraitExpr = 21,
+                    AsTypeExpr = 22,
+                    AtomicExpr = 23,
+                    BinaryOperator = 24,
+                    CompoundAssignOperator = 25,
+                    BlockExpr = 26,
+                    CXXBindTemporaryExpr = 27,
+                    CXXBoolLiteralExpr = 28,
+                    CXXConstructExpr = 29,
+                    CXXTemporaryObjectExpr = 30,
+                    CXXDefaultArgExpr = 31,
+                    CXXDefaultInitExpr = 32,
+                    CXXDeleteExpr = 33,
+                    CXXDependentScopeMemberExpr = 34,
+                    CXXFoldExpr = 35,
+                    CXXInheritedCtorInitExpr = 36,
+                    CXXNewExpr = 37,
+                    CXXNoexceptExpr = 38,
+                    CXXNullPtrLiteralExpr = 39,
+                    CXXPseudoDestructorExpr = 40,
+                    CXXScalarValueInitExpr = 41,
+                    CXXStdInitializerListExpr = 42,
+                    CXXThisExpr = 43,
+                    CXXThrowExpr = 44,
+                    CXXTypeidExpr = 45,
+                    CXXUnresolvedConstructExpr = 46,
+                    CXXUuidofExpr = 47,
+                    CallExpr = 48,
+                    CUDAKernelCallExpr = 49,
+                    CXXMemberCallExpr = 50,
+                    CXXOperatorCallExpr = 51,
+                    UserDefinedLiteral = 52,
+                    CStyleCastExpr = 53,
+                    CXXFunctionalCastExpr = 54,
+                    CXXConstCastExpr = 55,
+                    CXXDynamicCastExpr = 56,
+                    CXXReinterpretCastExpr = 57,
+                    CXXStaticCastExpr = 58,
+                    ImplicitCastExpr = 60,
+                    CharacterLiteral = 61,
+                    ChooseExpr = 62,
+                    CompoundLiteralExpr = 63,
+                    ConvertVectorExpr = 64,
+                    CoawaitExpr = 65,
+                    CoyieldExpr = 66,
+                    DeclRefExpr = 67,
+                    DependentCoawaitExpr = 68,
+                    DependentScopeDeclRefExpr = 69,
+                    DesignatedInitExpr = 70,
+                    DesignatedInitUpdateExpr = 71,
+                    ExpressionTraitExpr = 72,
+                    ExtVectorElementExpr = 73,
+                    FixedPointLiteral = 74,
+                    FloatingLiteral = 75,
+                    ConstantExpr = 76,
+                    ExprWithCleanups = 77,
+                    FunctionParmPackExpr = 78,
+                    GNUNullExpr = 79,
+                    GenericSelectionExpr = 80,
+                    ImaginaryLiteral = 81,
+                    ImplicitValueInitExpr = 82,
+                    InitListExpr = 83,
+                    IntegerLiteral = 84,
+                    LambdaExpr = 85,
+                    MSPropertyRefExpr = 86,
+                    MSPropertySubscriptExpr = 87,
+                    MaterializeTemporaryExpr = 88,
+                    MemberExpr = 89,
+                    NoInitExpr = 90,
+                    OffsetOfExpr = 107,
+                    OpaqueValueExpr = 108,
+                    UnresolvedLookupExpr = 109,
+                    UnresolvedMemberExpr = 110,
+                    PackExpansionExpr = 111,
+                    ParenExpr = 112,
+                    ParenListExpr = 113,
+                    PredefinedExpr = 114,
+                    PseudoObjectExpr = 115,
+                    ShuffleVectorExpr = 116,
+                    SizeOfPackExpr = 117,
+                    StmtExpr = 118,
+                    StringLiteral = 119,
+                    SubstNonTypeTemplateParmExpr = 120,
+                    SubstNonTypeTemplateParmPackExpr = 121,
+                    TypeTraitExpr = 122,
+                    TypoExpr = 123,
+                    UnaryExprOrTypeTraitExpr = 124,
+                    UnaryOperator = 125,
+                    VAArgExpr = 126,
+                    ForStmt = 127,
+                    GotoStmt = 128,
+                    IfStmt = 129,
+                    IndirectGotoStmt = 130,
+                    LabelStmt = 131,
+                    MSDependentExistsStmt = 132,
+                    NullStmt = 133,
+                    ReturnStmt = 188,
+                    SEHExceptStmt = 189,
+                    SEHFinallyStmt = 190,
+                    SEHLeaveStmt = 191,
+                    SEHTryStmt = 192,
+                    CaseStmt = 193,
+                    DefaultStmt = 194,
+                    SwitchStmt = 195,
+                    WhileStmt = 196
+                }
+
                 public global::System.IntPtr __Instance { get; protected set; }
 
                 protected int __PointerAdjustment;
@@ -17544,7 +17547,7 @@ public Stmt()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public Stmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public Stmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.Stmt.__Internal));
                     __ownsNativeInstance = true;
@@ -17576,12 +17579,12 @@ public virtual void Dispose(bool disposing)
                     __Instance = IntPtr.Zero;
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.Stmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.Stmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.Stmt(klass);
                 }
 
-                public global::CppSharp.Parser.AST.StmtClass StmtClass
+                public global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass
                 {
                     get
                     {
@@ -17607,6 +17610,19 @@ public virtual void Dispose(bool disposing)
                     }
                 }
 
+                public global::CppSharp.Parser.SourceLocation BeginLoc
+                {
+                    get
+                    {
+                        return global::CppSharp.Parser.SourceLocation.__CreateInstance(((global::CppSharp.Parser.AST.Stmt.__Internal*) __Instance)->beginLoc);
+                    }
+
+                    set
+                    {
+                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->beginLoc = value.__Instance;
+                    }
+                }
+
                 public global::CppSharp.Parser.SourceLocation EndLoc
                 {
                     get
@@ -17641,28 +17657,31 @@ public virtual void Dispose(bool disposing)
 
             public unsafe partial class DeclStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ decls;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isSingleDecl;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr singleDecl;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17835,25 +17854,28 @@ public uint GetdeclsCount
 
             public unsafe partial class NullStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal semiLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal byte hasLeadingEmptyMacro;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17947,40 +17969,43 @@ public bool HasLeadingEmptyMacro
 
             public unsafe partial class CompoundStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_S_allocator__S0_ body;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte body_empty;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal uint size;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr body_front;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr body_back;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBracLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18210,28 +18235,31 @@ public uint GetbodyCount
 
             public unsafe partial class SwitchCase : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18241,8 +18269,8 @@ public unsafe partial class SwitchCase : global::CppSharp.Parser.AST.Stmt, IDisp
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST10SwitchCaseC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST10SwitchCaseC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -18292,7 +18320,7 @@ public SwitchCase()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public SwitchCase(global::CppSharp.Parser.AST.StmtClass klass)
+                public SwitchCase(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.SwitchCase.__Internal));
@@ -18310,7 +18338,7 @@ public SwitchCase(global::CppSharp.Parser.AST.SwitchCase _0)
                     *((global::CppSharp.Parser.AST.SwitchCase.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.SwitchCase.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.SwitchCase(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.SwitchCase(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.SwitchCase(klass);
                 }
@@ -18362,43 +18390,46 @@ public SwitchCase(global::CppSharp.Parser.AST.SwitchCase _0)
 
             public unsafe partial class CaseStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal caseLoc;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal byte caseStmtIsGNURange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18541,31 +18572,34 @@ public bool CaseStmtIsGNURange
 
             public unsafe partial class DefaultStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal defaultLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18646,28 +18680,31 @@ public DefaultStmt(global::CppSharp.Parser.AST.DefaultStmt _0)
 
             public unsafe partial class LabelStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal identLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr subStmt;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal identLoc;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr subStmt;
+
+                    [FieldOffset(48)]
                     internal global::System.IntPtr name;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18779,25 +18816,28 @@ public string Name
 
             public unsafe partial class AttributedStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal attrLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal attrLoc;
+
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18896,55 +18936,58 @@ public AttributedStmt(global::CppSharp.Parser.AST.AttributedStmt _0)
 
             public unsafe partial class IfStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr then;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr _else;
+                    internal global::System.IntPtr then;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr _else;
 
                     [FieldOffset(56)]
+                    internal global::System.IntPtr init;
+
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ifLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal elseLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal byte _constexpr;
 
-                    [FieldOffset(65)]
+                    [FieldOffset(73)]
                     internal byte hasInitStorage;
 
-                    [FieldOffset(66)]
+                    [FieldOffset(74)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(67)]
+                    [FieldOffset(75)]
                     internal byte hasElseStorage;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte isObjCAvailabilityCheck;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19193,43 +19236,46 @@ public bool IsObjCAvailabilityCheck
 
             public unsafe partial class SwitchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(48)]
+                    internal global::System.IntPtr init;
+
+                    [FieldOffset(56)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal switchLoc;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte hasInitStorage;
 
-                    [FieldOffset(53)]
+                    [FieldOffset(61)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal byte isAllEnumCasesCovered;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19421,34 +19467,37 @@ public bool IsAllEnumCasesCovered
 
             public unsafe partial class WhileStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr body;
+
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19596,34 +19645,37 @@ public bool HasVarStorage
 
             public unsafe partial class DoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr body;
+
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal doLoc;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19766,43 +19818,46 @@ public DoStmt(global::CppSharp.Parser.AST.DoStmt _0)
 
             public unsafe partial class ForStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr inc;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr inc;
 
                     [FieldOffset(56)]
+                    internal global::System.IntPtr body;
+
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19999,25 +20054,28 @@ public ForStmt(global::CppSharp.Parser.AST.ForStmt _0)
 
             public unsafe partial class GotoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal labelLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20111,28 +20169,31 @@ public GotoStmt(global::CppSharp.Parser.AST.GotoStmt _0)
 
             public unsafe partial class IndirectGotoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal starLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr target;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20244,22 +20305,25 @@ public IndirectGotoStmt(global::CppSharp.Parser.AST.IndirectGotoStmt _0)
 
             public unsafe partial class ContinueStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal continueLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20340,22 +20404,25 @@ public ContinueStmt(global::CppSharp.Parser.AST.ContinueStmt _0)
 
             public unsafe partial class BreakStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal breakLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20436,25 +20503,28 @@ public BreakStmt(global::CppSharp.Parser.AST.BreakStmt _0)
 
             public unsafe partial class ReturnStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr retValue;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::System.IntPtr retValue;
+
+                    [FieldOffset(40)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal returnLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20553,46 +20623,49 @@ public ReturnStmt(global::CppSharp.Parser.AST.ReturnStmt _0)
 
             public unsafe partial class AsmStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal byte simple;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(85)]
                     internal byte _volatile;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numOutputs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numInputs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numClobbers;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20602,8 +20675,8 @@ public unsafe partial class AsmStmt : global::CppSharp.Parser.AST.Stmt, IDisposa
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST7AsmStmtC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST7AsmStmtC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -20698,7 +20771,7 @@ public AsmStmt()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public AsmStmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public AsmStmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.AsmStmt.__Internal));
@@ -20780,7 +20853,7 @@ public void Clearoutputs()
                     __Internal.Clearoutputs((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.AsmStmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.AsmStmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.AsmStmt(klass);
                 }
@@ -20897,49 +20970,52 @@ public uint GetoutputsCount
 
             public unsafe partial class GCCAsmStmt : global::CppSharp.Parser.AST.AsmStmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal byte simple;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(85)]
                     internal byte _volatile;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numOutputs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numInputs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numClobbers;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21228,58 +21304,61 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class MSAsmStmt : global::CppSharp.Parser.AST.AsmStmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 144)]
+                [StructLayout(LayoutKind.Explicit, Size = 152)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal byte simple;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(85)]
                     internal byte _volatile;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numOutputs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numInputs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numClobbers;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBraceLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte hasBraces;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numAsmToks;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C asmString;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21423,28 +21502,31 @@ public string AsmString
 
             public unsafe partial class SEHExceptStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal exceptLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr filterExpr;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal exceptLoc;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr filterExpr;
+
+                    [FieldOffset(48)]
                     internal global::System.IntPtr block;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21561,25 +21643,28 @@ public SEHExceptStmt(global::CppSharp.Parser.AST.SEHExceptStmt _0)
 
             public unsafe partial class SEHFinallyStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal finallyLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal finallyLoc;
+
+                    [FieldOffset(40)]
                     internal global::System.IntPtr block;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21678,37 +21763,40 @@ public SEHFinallyStmt(global::CppSharp.Parser.AST.SEHFinallyStmt _0)
 
             public unsafe partial class SEHTryStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal byte isCXXTry;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr tryBlock;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr handler;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr exceptHandler;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr finallyHandler;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21874,22 +21962,25 @@ public bool IsCXXTry
 
             public unsafe partial class SEHLeaveStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal leaveLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21970,28 +22061,31 @@ public SEHLeaveStmt(global::CppSharp.Parser.AST.SEHLeaveStmt _0)
 
             public unsafe partial class CapturedStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ capture_inits;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr capturedStmt;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal uint capture_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22356,28 +22450,31 @@ public uint GetcaptureInitsCount
 
             public unsafe partial class CXXCatchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal catchLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal catchLoc;
+
+                    [FieldOffset(40)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal caughtType;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr handlerBlock;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22489,28 +22586,31 @@ public CXXCatchStmt(global::CppSharp.Parser.AST.CXXCatchStmt _0)
 
             public unsafe partial class CXXTryStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr tryBlock;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr tryBlock;
+
+                    [FieldOffset(48)]
                     internal uint numHandlers;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22622,58 +22722,61 @@ public uint NumHandlers
 
             public unsafe partial class CXXForRangeStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr rangeInit;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr rangeInit;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr inc;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(56)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr inc;
 
                     [FieldOffset(64)]
-                    internal global::System.IntPtr rangeStmt;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(72)]
-                    internal global::System.IntPtr beginStmt;
+                    internal global::System.IntPtr rangeStmt;
 
                     [FieldOffset(80)]
-                    internal global::System.IntPtr endStmt;
+                    internal global::System.IntPtr beginStmt;
 
                     [FieldOffset(88)]
-                    internal global::System.IntPtr loopVarStmt;
+                    internal global::System.IntPtr endStmt;
 
                     [FieldOffset(96)]
+                    internal global::System.IntPtr loopVarStmt;
+
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal coawaitLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22955,31 +23058,34 @@ public CXXForRangeStmt(global::CppSharp.Parser.AST.CXXForRangeStmt _0)
 
             public unsafe partial class MSDependentExistsStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal byte isIfExists;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(37)]
                     internal byte isIfNotExists;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23104,58 +23210,61 @@ public bool IsIfNotExists
 
             public unsafe partial class CoroutineBodyStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal byte hasDependentPromiseType;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal byte hasDependentPromiseType;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr promiseDeclStmt;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr initSuspendStmt;
+                    internal global::System.IntPtr promiseDeclStmt;
 
                     [FieldOffset(56)]
-                    internal global::System.IntPtr finalSuspendStmt;
+                    internal global::System.IntPtr initSuspendStmt;
 
                     [FieldOffset(64)]
-                    internal global::System.IntPtr exceptionHandler;
+                    internal global::System.IntPtr finalSuspendStmt;
 
                     [FieldOffset(72)]
-                    internal global::System.IntPtr fallthroughHandler;
+                    internal global::System.IntPtr exceptionHandler;
 
                     [FieldOffset(80)]
-                    internal global::System.IntPtr allocate;
+                    internal global::System.IntPtr fallthroughHandler;
 
                     [FieldOffset(88)]
-                    internal global::System.IntPtr deallocate;
+                    internal global::System.IntPtr allocate;
 
                     [FieldOffset(96)]
-                    internal global::System.IntPtr returnValueInit;
+                    internal global::System.IntPtr deallocate;
 
                     [FieldOffset(104)]
-                    internal global::System.IntPtr resultDecl;
+                    internal global::System.IntPtr returnValueInit;
 
                     [FieldOffset(112)]
-                    internal global::System.IntPtr returnStmt;
+                    internal global::System.IntPtr resultDecl;
 
                     [FieldOffset(120)]
+                    internal global::System.IntPtr returnStmt;
+
+                    [FieldOffset(128)]
                     internal global::System.IntPtr returnStmtOnAllocFailure;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23557,31 +23666,34 @@ public bool HasDependentPromiseType
 
             public unsafe partial class CoreturnStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal byte isImplicit;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr promiseCall;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23911,61 +24023,64 @@ public enum UnaryExprOrTypeTrait
 
             public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23975,8 +24090,8 @@ public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST4ExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST4ExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -24337,7 +24452,7 @@ public Expr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public Expr(global::CppSharp.Parser.AST.StmtClass klass)
+                public Expr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.Expr.__Internal));
@@ -24355,7 +24470,7 @@ public Expr(global::CppSharp.Parser.AST.Expr _0)
                     *((global::CppSharp.Parser.AST.Expr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.Expr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.Expr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.Expr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.Expr(klass);
                 }
@@ -24555,64 +24670,67 @@ public bool HasPlaceholderType
 
             public unsafe partial class FullExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -24622,8 +24740,8 @@ public unsafe partial class FullExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST8FullExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST8FullExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -24673,7 +24791,7 @@ public FullExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public FullExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public FullExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.FullExpr.__Internal));
@@ -24691,7 +24809,7 @@ public FullExpr(global::CppSharp.Parser.AST.FullExpr _0)
                     *((global::CppSharp.Parser.AST.FullExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.FullExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.FullExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.FullExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.FullExpr(klass);
                 }
@@ -24717,64 +24835,67 @@ public FullExpr(global::CppSharp.Parser.AST.FullExpr _0)
 
             public unsafe partial class ConstantExpr : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -24842,70 +24963,73 @@ public ConstantExpr(global::CppSharp.Parser.AST.ConstantExpr _0)
 
             public unsafe partial class OpaqueValueExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte isUnique;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr sourceExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25017,97 +25141,100 @@ public bool IsUnique
 
             public unsafe partial class DeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(81)]
+                    [FieldOffset(89)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr foundDecl;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hasTemplateKWAndArgsInfo;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(113)]
+                    [FieldOffset(121)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte refersToEnclosingVariableOrCapture;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25336,67 +25463,70 @@ public bool RefersToEnclosingVariableOrCapture
 
             public unsafe partial class IntegerLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal ulong value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25490,67 +25620,70 @@ public ulong Value
 
             public unsafe partial class FixedPointLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal ulong value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25644,70 +25777,73 @@ public ulong Value
 
             public unsafe partial class CharacterLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.CharacterLiteral.CharacterKind kind;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25823,70 +25959,73 @@ public uint Value
 
             public unsafe partial class FloatingLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte exact;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal double valueAsApproximateDouble;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25993,64 +26132,67 @@ public double ValueAsApproximateDouble
 
             public unsafe partial class ImaginaryLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26136,106 +26278,109 @@ public ImaginaryLiteral(global::CppSharp.Parser.AST.ImaginaryLiteral _0)
 
             public unsafe partial class StringLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 184)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C bytes;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint byteLength;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal uint length;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal uint charByteWidth;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal global::CppSharp.Parser.AST.StringLiteral.StringKind kind;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal byte isAscii;
 
-                    [FieldOffset(161)]
+                    [FieldOffset(169)]
                     internal byte isWide;
 
-                    [FieldOffset(162)]
+                    [FieldOffset(170)]
                     internal byte isUTF8;
 
-                    [FieldOffset(163)]
+                    [FieldOffset(171)]
                     internal byte isUTF16;
 
-                    [FieldOffset(164)]
+                    [FieldOffset(172)]
                     internal byte isUTF32;
 
-                    [FieldOffset(165)]
+                    [FieldOffset(173)]
                     internal byte isPascal;
 
-                    [FieldOffset(166)]
+                    [FieldOffset(174)]
                     internal byte containsNonAscii;
 
-                    [FieldOffset(167)]
+                    [FieldOffset(175)]
                     internal byte containsNonAsciiOrNull;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal uint numConcatenated;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26534,67 +26679,70 @@ public uint NumConcatenated
 
             public unsafe partial class PredefinedExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.PredefinedExpr.IdentKind identKind;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26700,70 +26848,73 @@ public PredefinedExpr(global::CppSharp.Parser.AST.PredefinedExpr _0)
 
             public unsafe partial class ParenExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParen;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParen;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26875,91 +27026,94 @@ public ParenExpr(global::CppSharp.Parser.AST.ParenExpr _0)
 
             public unsafe partial class UnaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.UnaryOperatorKind opcode;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte canOverflow;
 
-                    [FieldOffset(93)]
+                    [FieldOffset(101)]
                     internal byte isPrefix;
 
-                    [FieldOffset(94)]
+                    [FieldOffset(102)]
                     internal byte isPostfix;
 
-                    [FieldOffset(95)]
+                    [FieldOffset(103)]
                     internal byte isIncrementOp;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte isDecrementOp;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte isIncrementDecrementOp;
 
-                    [FieldOffset(98)]
+                    [FieldOffset(106)]
                     internal byte isArithmeticOp;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27162,73 +27316,76 @@ public bool IsArithmeticOp
 
             public unsafe partial class OffsetOfExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numComponents;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numExpressions;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27348,82 +27505,85 @@ public uint NumExpressions
 
             public unsafe partial class UnaryExprOrTypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.UnaryExprOrTypeTrait kind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte isArgumentType;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal argumentType;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr argumentExpr;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeOfArgument;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27587,76 +27747,79 @@ public bool IsArgumentType
 
             public unsafe partial class ArraySubscriptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracketLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr idx;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27809,88 +27972,91 @@ public ArraySubscriptExpr(global::CppSharp.Parser.AST.ArraySubscriptExpr _0)
 
             public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27900,8 +28066,8 @@ public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST8CallExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST8CallExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -27976,7 +28142,7 @@ public CallExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CallExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CallExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CallExpr.__Internal));
@@ -28034,7 +28200,7 @@ public void Cleararguments()
                     __Internal.Cleararguments((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CallExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CallExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CallExpr(klass);
                 }
@@ -28170,100 +28336,103 @@ public uint GetargumentsCount
 
             public unsafe partial class MemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte arrow;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(113)]
+                    [FieldOffset(121)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal byte isImplicitAccess;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28505,70 +28674,73 @@ public bool IsImplicitAccess
 
             public unsafe partial class CompoundLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr initializer;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte fileScope;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28680,82 +28852,85 @@ public bool FileScope
 
             public unsafe partial class CastExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28765,8 +28940,8 @@ public unsafe partial class CastExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST8CastExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST8CastExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -28816,7 +28991,7 @@ public CastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CastExpr.__Internal));
@@ -28834,7 +29009,7 @@ public CastExpr(global::CppSharp.Parser.AST.CastExpr _0)
                     *((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CastExpr(klass);
                 }
@@ -28948,85 +29123,88 @@ public uint PathSize
 
             public unsafe partial class ImplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte isPartOfExplicitCast;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29112,85 +29290,88 @@ public bool IsPartOfExplicitCast
 
             public unsafe partial class ExplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29200,8 +29381,8 @@ public unsafe partial class ExplicitCastExpr : global::CppSharp.Parser.AST.CastE
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST16ExplicitCastExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST16ExplicitCastExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -29251,7 +29432,7 @@ public ExplicitCastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public ExplicitCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public ExplicitCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal));
@@ -29269,7 +29450,7 @@ public ExplicitCastExpr(global::CppSharp.Parser.AST.ExplicitCastExpr _0)
                     *((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.ExplicitCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.ExplicitCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.ExplicitCastExpr(klass);
                 }
@@ -29290,91 +29471,94 @@ public ExplicitCastExpr(global::CppSharp.Parser.AST.ExplicitCastExpr _0)
 
             public unsafe partial class CStyleCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 144)]
+                [StructLayout(LayoutKind.Explicit, Size = 152)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29468,118 +29652,121 @@ public CStyleCastExpr(global::CppSharp.Parser.AST.CStyleCastExpr _0)
 
             public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind opcode;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte isPtrMemOp;
 
-                    [FieldOffset(137)]
+                    [FieldOffset(145)]
                     internal byte isMultiplicativeOp;
 
-                    [FieldOffset(138)]
+                    [FieldOffset(146)]
                     internal byte isAdditiveOp;
 
-                    [FieldOffset(139)]
+                    [FieldOffset(147)]
                     internal byte isShiftOp;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal byte isBitwiseOp;
 
-                    [FieldOffset(141)]
+                    [FieldOffset(149)]
                     internal byte isRelationalOp;
 
-                    [FieldOffset(142)]
+                    [FieldOffset(150)]
                     internal byte isEqualityOp;
 
-                    [FieldOffset(143)]
+                    [FieldOffset(151)]
                     internal byte isComparisonOp;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal byte isLogicalOp;
 
-                    [FieldOffset(145)]
+                    [FieldOffset(153)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(146)]
+                    [FieldOffset(154)]
                     internal byte isCompoundAssignmentOp;
 
-                    [FieldOffset(147)]
+                    [FieldOffset(155)]
                     internal byte isShiftAssignOp;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isFPContractableWithinStatement;
 
-                    [FieldOffset(149)]
+                    [FieldOffset(157)]
                     internal byte isFEnvAccessOn;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29589,8 +29776,8 @@ public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, I
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST14BinaryOperatorC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST14BinaryOperatorC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -29645,7 +29832,7 @@ public BinaryOperator()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public BinaryOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public BinaryOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.BinaryOperator.__Internal));
@@ -29679,7 +29866,7 @@ public override void Dispose(bool disposing)
                     __Instance = IntPtr.Zero;
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.BinaryOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.BinaryOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.BinaryOperator(klass);
                 }
@@ -29947,124 +30134,127 @@ public bool IsFEnvAccessOn
 
             public unsafe partial class CompoundAssignOperator : global::CppSharp.Parser.AST.BinaryOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 184)]
+                [StructLayout(LayoutKind.Explicit, Size = 192)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind opcode;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte isPtrMemOp;
 
-                    [FieldOffset(137)]
+                    [FieldOffset(145)]
                     internal byte isMultiplicativeOp;
 
-                    [FieldOffset(138)]
+                    [FieldOffset(146)]
                     internal byte isAdditiveOp;
 
-                    [FieldOffset(139)]
+                    [FieldOffset(147)]
                     internal byte isShiftOp;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal byte isBitwiseOp;
 
-                    [FieldOffset(141)]
+                    [FieldOffset(149)]
                     internal byte isRelationalOp;
 
-                    [FieldOffset(142)]
+                    [FieldOffset(150)]
                     internal byte isEqualityOp;
 
-                    [FieldOffset(143)]
+                    [FieldOffset(151)]
                     internal byte isComparisonOp;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal byte isLogicalOp;
 
-                    [FieldOffset(145)]
+                    [FieldOffset(153)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(146)]
+                    [FieldOffset(154)]
                     internal byte isCompoundAssignmentOp;
 
-                    [FieldOffset(147)]
+                    [FieldOffset(155)]
                     internal byte isShiftAssignOp;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isFPContractableWithinStatement;
 
-                    [FieldOffset(149)]
+                    [FieldOffset(157)]
                     internal byte isFEnvAccessOn;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal computationLHSType;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal computationResultType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30179,76 +30369,79 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class AbstractConditionalOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30258,8 +30451,8 @@ public unsafe partial class AbstractConditionalOperator : global::CppSharp.Parse
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST27AbstractConditionalOperatorC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST27AbstractConditionalOperatorC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -30309,7 +30502,7 @@ public AbstractConditionalOperator()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public AbstractConditionalOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public AbstractConditionalOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal));
@@ -30327,7 +30520,7 @@ public AbstractConditionalOperator(global::CppSharp.Parser.AST.AbstractCondition
                     *((global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.AbstractConditionalOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.AbstractConditionalOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.AbstractConditionalOperator(klass);
                 }
@@ -30415,82 +30608,85 @@ public AbstractConditionalOperator(global::CppSharp.Parser.AST.AbstractCondition
 
             public unsafe partial class ConditionalOperator : global::CppSharp.Parser.AST.AbstractConditionalOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr rHS;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30594,82 +30790,85 @@ public ConditionalOperator(global::CppSharp.Parser.AST.ConditionalOperator _0)
 
             public unsafe partial class BinaryConditionalOperator : global::CppSharp.Parser.AST.AbstractConditionalOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr common;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr opaqueValue;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30773,67 +30972,70 @@ public BinaryConditionalOperator(global::CppSharp.Parser.AST.BinaryConditionalOp
 
             public unsafe partial class AddrLabelExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ampAmpLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal labelLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30927,70 +31129,73 @@ public AddrLabelExpr(global::CppSharp.Parser.AST.AddrLabelExpr _0)
 
             public unsafe partial class StmtExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subStmt;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31102,70 +31307,73 @@ public StmtExpr(global::CppSharp.Parser.AST.StmtExpr _0)
 
             public unsafe partial class ShuffleVectorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numSubExprs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31272,70 +31480,73 @@ public uint NumSubExprs
 
             public unsafe partial class ConvertVectorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr srcExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31447,85 +31658,88 @@ public ConvertVectorExpr(global::CppSharp.Parser.AST.ConvertVectorExpr _0)
 
             public unsafe partial class ChooseExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte isConditionTrue;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte isConditionDependent;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr chosenSubExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31717,64 +31931,67 @@ public bool IsConditionDependent
 
             public unsafe partial class GNUNullExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tokenLocation;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31855,73 +32072,76 @@ public GNUNullExpr(global::CppSharp.Parser.AST.GNUNullExpr _0)
 
             public unsafe partial class VAArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte isMicrosoftABI;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -32046,97 +32266,100 @@ public bool IsMicrosoftABI
 
             public unsafe partial class InitListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr arrayFiller;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBraceLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBraceLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr syntacticForm;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numInits;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal byte hasArrayFiller;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(117)]
                     internal byte isExplicit;
 
-                    [FieldOffset(110)]
+                    [FieldOffset(118)]
                     internal byte isStringLiteralInit;
 
-                    [FieldOffset(111)]
+                    [FieldOffset(119)]
                     internal byte isTransparent;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte isSemanticForm;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr semanticForm;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isSyntacticForm;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -32375,79 +32598,82 @@ public bool IsSyntacticForm
 
             public unsafe partial class DesignatedInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal equalOrColonLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr init;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint size;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte usesGNUSyntax;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal uint numSubExprs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceRange.__Internal designatorsSourceRange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33043,61 +33269,64 @@ public uint NumSubExprs
 
             public unsafe partial class NoInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33165,67 +33394,70 @@ public NoInitExpr(global::CppSharp.Parser.AST.NoInitExpr _0)
 
             public unsafe partial class DesignatedInitUpdateExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr updater;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33329,67 +33561,70 @@ public DesignatedInitUpdateExpr(global::CppSharp.Parser.AST.DesignatedInitUpdate
 
             public unsafe partial class ArrayInitLoopExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33493,61 +33728,64 @@ public ArrayInitLoopExpr(global::CppSharp.Parser.AST.ArrayInitLoopExpr _0)
 
             public unsafe partial class ArrayInitIndexExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33615,61 +33853,64 @@ public ArrayInitIndexExpr(global::CppSharp.Parser.AST.ArrayInitIndexExpr _0)
 
             public unsafe partial class ImplicitValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33737,70 +33978,73 @@ public ImplicitValueInitExpr(global::CppSharp.Parser.AST.ImplicitValueInitExpr _
 
             public unsafe partial class ParenListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numExprs;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33907,85 +34151,88 @@ public uint NumExprs
 
             public unsafe partial class GenericSelectionExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numAssocs;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal genericLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal defaultLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr controllingExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal byte isResultDependent;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal uint resultIndex;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr resultExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34167,76 +34414,79 @@ public uint ResultIndex
 
             public unsafe partial class ExtVectorElementExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal accessorLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numElements;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte containsDuplicateElements;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte isArrow;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34374,67 +34624,70 @@ public bool IsArrow
 
             public unsafe partial class BlockExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal caretLocation;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr body;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34533,70 +34786,73 @@ public BlockExpr(global::CppSharp.Parser.AST.BlockExpr _0)
 
             public unsafe partial class AsTypeExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr srcExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34708,73 +34964,76 @@ public AsTypeExpr(global::CppSharp.Parser.AST.AsTypeExpr _0)
 
             public unsafe partial class PseudoObjectExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr syntacticForm;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint resultExprIndex;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr resultExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numSemanticExprs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34904,106 +35163,109 @@ public uint NumSemanticExprs
 
             public unsafe partial class AtomicExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 184)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr ptr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr order;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr scope;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr val1;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr orderFail;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr val2;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr weak;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal valueType;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.AtomicExpr.AtomicOp op;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal uint numSubExprs;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal byte isVolatile;
 
-                    [FieldOffset(161)]
+                    [FieldOffset(169)]
                     internal byte isCmpXChg;
 
-                    [FieldOffset(162)]
+                    [FieldOffset(170)]
                     internal byte isOpenCL;
 
-                    [FieldOffset(164)]
+                    [FieldOffset(172)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35351,61 +35613,64 @@ public bool IsOpenCL
 
             public unsafe partial class TypoExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35473,103 +35738,106 @@ public TypoExpr(global::CppSharp.Parser.AST.TypoExpr _0)
 
             public unsafe partial class CXXOperatorCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.OverloadedOperatorKind _operator;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(157)]
+                    [FieldOffset(165)]
                     internal byte isInfixBinaryOp;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(164)]
+                    [FieldOffset(172)]
                     internal byte isFPContractableWithinStatement;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35723,94 +35991,97 @@ public bool IsFPContractableWithinStatement
 
             public unsafe partial class CXXMemberCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::System.IntPtr implicitObjectArgument;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::System.IntPtr methodDecl;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35935,91 +36206,94 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CUDAKernelCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::System.IntPtr config;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36126,97 +36400,100 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CXXNamedCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36226,8 +36503,8 @@ public unsafe partial class CXXNamedCastExpr : global::CppSharp.Parser.AST.Expli
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXNamedCastExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXNamedCastExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -36277,7 +36554,7 @@ public CXXNamedCastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CXXNamedCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CXXNamedCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal));
@@ -36295,7 +36572,7 @@ public CXXNamedCastExpr(global::CppSharp.Parser.AST.CXXNamedCastExpr _0)
                     *((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CXXNamedCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CXXNamedCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CXXNamedCastExpr(klass);
                 }
@@ -36355,97 +36632,100 @@ public string CastName
 
             public unsafe partial class CXXStaticCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36513,100 +36793,103 @@ public CXXStaticCastExpr(global::CppSharp.Parser.AST.CXXStaticCastExpr _0)
 
             public unsafe partial class CXXDynamicCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal byte isAlwaysNull;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36687,97 +36970,100 @@ public bool IsAlwaysNull
 
             public unsafe partial class CXXReinterpretCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36845,97 +37131,100 @@ public CXXReinterpretCastExpr(global::CppSharp.Parser.AST.CXXReinterpretCastExpr
 
             public unsafe partial class CXXConstCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37003,97 +37292,100 @@ public CXXConstCastExpr(global::CppSharp.Parser.AST.CXXConstCastExpr _0)
 
             public unsafe partial class UserDefinedLiteral : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 184)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.UserDefinedLiteral.LiteralOperatorKind literalOperatorKind;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::System.IntPtr cookedLiteral;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal uDSuffixLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37236,67 +37528,70 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CXXBoolLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte value;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37390,64 +37685,67 @@ public bool Value
 
             public unsafe partial class CXXNullPtrLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37528,64 +37826,67 @@ public CXXNullPtrLiteralExpr(global::CppSharp.Parser.AST.CXXNullPtrLiteralExpr _
 
             public unsafe partial class CXXStdInitializerListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37671,70 +37972,73 @@ public CXXStdInitializerListExpr(global::CppSharp.Parser.AST.CXXStdInitializerLi
 
             public unsafe partial class CXXTypeidExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr exprOperand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte isPotentiallyEvaluated;
 
-                    [FieldOffset(89)]
+                    [FieldOffset(97)]
                     internal byte isTypeOperand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37846,73 +38150,76 @@ public bool IsTypeOperand
 
             public unsafe partial class MSPropertyRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr baseExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte isArrow;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38037,70 +38344,73 @@ public bool IsArrow
 
             public unsafe partial class MSPropertySubscriptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracketLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr idx;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38217,70 +38527,73 @@ public MSPropertySubscriptExpr(global::CppSharp.Parser.AST.MSPropertySubscriptEx
 
             public unsafe partial class CXXUuidofExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr exprOperand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C uuidStr;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte isTypeOperand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38416,67 +38729,70 @@ public bool IsTypeOperand
 
             public unsafe partial class CXXThisExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte @implicit;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38570,70 +38886,73 @@ public bool Implicit
 
             public unsafe partial class CXXThrowExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal throwLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte isThrownVariableInScope;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38745,67 +39064,70 @@ public bool IsThrownVariableInScope
 
             public unsafe partial class CXXDefaultArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr expr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal usedLocation;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38904,67 +39226,70 @@ public CXXDefaultArgExpr(global::CppSharp.Parser.AST.CXXDefaultArgExpr _0)
 
             public unsafe partial class CXXDefaultInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr field;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr expr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39068,64 +39393,67 @@ public CXXDefaultInitExpr(global::CppSharp.Parser.AST.CXXDefaultInitExpr _0)
 
             public unsafe partial class CXXBindTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39211,88 +39539,91 @@ public CXXBindTemporaryExpr(global::CppSharp.Parser.AST.CXXBindTemporaryExpr _0)
 
             public unsafe partial class CXXConstructExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal byte elidable;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(117)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(110)]
+                    [FieldOffset(118)]
                     internal byte listInitialization;
 
-                    [FieldOffset(111)]
+                    [FieldOffset(119)]
                     internal byte stdInitListInitialization;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte requiresZeroInitialization;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal global::CppSharp.Parser.SourceRange.__Internal parenOrBraceRange;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39302,8 +39633,8 @@ public unsafe partial class CXXConstructExpr : global::CppSharp.Parser.AST.Expr,
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXConstructExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXConstructExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -39386,7 +39717,7 @@ public CXXConstructExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CXXConstructExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CXXConstructExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CXXConstructExpr.__Internal));
@@ -39444,7 +39775,7 @@ public void Cleararguments()
                     __Internal.Cleararguments((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CXXConstructExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CXXConstructExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CXXConstructExpr(klass);
                 }
@@ -39565,70 +39896,73 @@ public uint GetargumentsCount
 
             public unsafe partial class CXXInheritedCtorInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte constructsVBase;
 
-                    [FieldOffset(74)]
+                    [FieldOffset(82)]
                     internal byte inheritedFromVBase;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39735,94 +40069,97 @@ public bool InheritedFromVBase
 
             public unsafe partial class CXXFunctionalCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal byte isListInitialization;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39929,88 +40266,91 @@ public bool IsListInitialization
 
             public unsafe partial class CXXTemporaryObjectExpr : global::CppSharp.Parser.AST.CXXConstructExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal byte elidable;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(117)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(110)]
+                    [FieldOffset(118)]
                     internal byte listInitialization;
 
-                    [FieldOffset(111)]
+                    [FieldOffset(119)]
                     internal byte stdInitListInitialization;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte requiresZeroInitialization;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal global::CppSharp.Parser.SourceRange.__Internal parenOrBraceRange;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40099,91 +40439,94 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class LambdaExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ capture_inits;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal captureDefaultLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal uint capture_size;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceRange.__Internal introducerRange;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr callOperator;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isGenericLambda;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr body;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal byte isMutable;
 
-                    [FieldOffset(145)]
+                    [FieldOffset(153)]
                     internal byte hasExplicitParameters;
 
-                    [FieldOffset(146)]
+                    [FieldOffset(154)]
                     internal byte hasExplicitResultType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40452,64 +40795,67 @@ public uint GetcaptureInitsCount
 
             public unsafe partial class CXXScalarValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40590,106 +40936,109 @@ public CXXScalarValueInitExpr(global::CppSharp.Parser.AST.CXXScalarValueInitExpr
 
             public unsafe partial class CXXNewExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 200)]
+                [StructLayout(LayoutKind.Explicit, Size = 208)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ placement_arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr operatorNew;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr operatorDelete;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal allocatedType;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte isArray;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::System.IntPtr arraySize;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal uint numPlacementArgs;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal byte isParenTypeId;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::CppSharp.Parser.SourceRange.__Internal typeIdParens;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal byte isGlobalNew;
 
-                    [FieldOffset(169)]
+                    [FieldOffset(177)]
                     internal byte hasInitializer;
 
-                    [FieldOffset(172)]
+                    [FieldOffset(180)]
                     internal global::CppSharp.Parser.AST.CXXNewExpr.InitializationStyle initializationStyle;
 
-                    [FieldOffset(176)]
+                    [FieldOffset(184)]
                     internal global::System.IntPtr initializer;
 
-                    [FieldOffset(184)]
+                    [FieldOffset(192)]
                     internal global::System.IntPtr constructExpr;
 
-                    [FieldOffset(192)]
+                    [FieldOffset(200)]
                     internal global::CppSharp.Parser.SourceRange.__Internal directInitRange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41045,79 +41394,82 @@ public uint GetplacementArgumentsCount
 
             public unsafe partial class CXXDeleteExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte isGlobalDelete;
 
-                    [FieldOffset(74)]
+                    [FieldOffset(82)]
                     internal byte isArrayForm;
 
-                    [FieldOffset(75)]
+                    [FieldOffset(83)]
                     internal byte isArrayFormAsWritten;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr operatorDelete;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr argument;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal destroyedType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41273,85 +41625,88 @@ public bool IsArrayFormAsWritten
 
             public unsafe partial class CXXPseudoDestructorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(89)]
+                    [FieldOffset(97)]
                     internal byte isArrow;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonColonLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tildeLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal destroyedType;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal destroyedTypeLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41528,67 +41883,70 @@ public bool IsArrow
 
             public unsafe partial class TypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte value;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41682,70 +42040,73 @@ public uint NumArgs
 
             public unsafe partial class ArrayTypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal queriedType;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal ulong value;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr dimensionExpression;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41857,67 +42218,70 @@ public ulong Value
 
             public unsafe partial class ExpressionTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr queriedExpression;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42016,85 +42380,88 @@ public bool Value
 
             public unsafe partial class OverloadExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numDecls;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42104,8 +42471,8 @@ public unsafe partial class OverloadExpr : global::CppSharp.Parser.AST.Expr, IDi
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST12OverloadExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST12OverloadExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -42243,7 +42610,7 @@ public OverloadExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public OverloadExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public OverloadExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.OverloadExpr.__Internal));
@@ -42261,7 +42628,7 @@ public OverloadExpr(global::CppSharp.Parser.AST.OverloadExpr _0)
                     *((global::CppSharp.Parser.AST.OverloadExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.OverloadExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.OverloadExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.OverloadExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.OverloadExpr(klass);
                 }
@@ -42373,91 +42740,94 @@ public uint NumTemplateArgs
 
             public unsafe partial class UnresolvedLookupExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numDecls;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal byte requiresADL;
 
-                    [FieldOffset(105)]
+                    [FieldOffset(113)]
                     internal byte isOverloaded;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42551,82 +42921,85 @@ public bool IsOverloaded
 
             public unsafe partial class DependentScopeDeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(93)]
+                    [FieldOffset(101)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42785,70 +43158,73 @@ public uint NumTemplateArgs
 
             public unsafe partial class ExprWithCleanups : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numObjects;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte cleanupsHaveSideEffects;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42942,79 +43318,82 @@ public bool CleanupsHaveSideEffects
 
             public unsafe partial class CXXUnresolvedConstructExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isListInitialization;
 
-                    [FieldOffset(132)]
+                    [FieldOffset(140)]
                     internal uint arg_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43221,100 +43600,103 @@ public uint GetargumentsCount
 
             public unsafe partial class CXXDependentScopeMemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 144)]
+                [StructLayout(LayoutKind.Explicit, Size = 152)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal baseType;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal byte isArrow;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr firstQualifierFoundInScope;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(132)]
+                    [FieldOffset(140)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(137)]
+                    [FieldOffset(145)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43561,106 +43943,109 @@ public uint NumTemplateArgs
 
             public unsafe partial class UnresolvedMemberExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numDecls;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal baseType;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte hasUnresolvedUsing;
 
-                    [FieldOffset(137)]
+                    [FieldOffset(145)]
                     internal byte isArrow;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43824,67 +44209,70 @@ public bool IsArrow
 
             public unsafe partial class CXXNoexceptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43983,67 +44371,70 @@ public bool Value
 
             public unsafe partial class PackExpansionExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr pattern;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44142,79 +44533,82 @@ public PackExpansionExpr(global::CppSharp.Parser.AST.PackExpansionExpr _0)
 
             public unsafe partial class SizeOfPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal packLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr pack;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal uint packLength;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte isPartiallySubstituted;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44365,67 +44759,70 @@ public bool IsPartiallySubstituted
 
             public unsafe partial class SubstNonTypeTemplateParmExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr replacement;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44524,67 +44921,70 @@ public SubstNonTypeTemplateParmExpr(global::CppSharp.Parser.AST.SubstNonTypeTemp
 
             public unsafe partial class SubstNonTypeTemplateParmPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal parameterPackLocation;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.TemplateArgument.__Internal argumentPack;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44678,67 +45078,70 @@ public SubstNonTypeTemplateParmPackExpr(global::CppSharp.Parser.AST.SubstNonType
 
             public unsafe partial class FunctionParmPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal parameterPackLocation;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numExpansions;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44832,73 +45235,76 @@ public uint NumExpansions
 
             public unsafe partial class MaterializeTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr temporary;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr TemporaryExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal uint manglingNumber;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte isBoundToLvalueReference;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45116,85 +45522,88 @@ public bool IsBoundToLvalueReference
 
             public unsafe partial class CXXFoldExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte isRightFold;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte isLeftFold;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr pattern;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr init;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind _operator;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45386,79 +45795,82 @@ public bool IsLeftFold
 
             public unsafe partial class CoroutineSuspendExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr resumeExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45468,8 +45880,8 @@ public unsafe partial class CoroutineSuspendExpr : global::CppSharp.Parser.AST.E
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST20CoroutineSuspendExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST20CoroutineSuspendExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -45528,7 +45940,7 @@ public CoroutineSuspendExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CoroutineSuspendExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CoroutineSuspendExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal));
@@ -45546,7 +45958,7 @@ public CoroutineSuspendExpr(global::CppSharp.Parser.AST.CoroutineSuspendExpr _0)
                     *((global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CoroutineSuspendExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CoroutineSuspendExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CoroutineSuspendExpr(klass);
                 }
@@ -45657,85 +46069,88 @@ public CoroutineSuspendExpr(global::CppSharp.Parser.AST.CoroutineSuspendExpr _0)
 
             public unsafe partial class CoawaitExpr : global::CppSharp.Parser.AST.CoroutineSuspendExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr resumeExpr;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte isImplicit;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr operand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45834,70 +46249,73 @@ public bool IsImplicit
 
             public unsafe partial class DependentCoawaitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr operatorCoawaitLookup;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -46014,82 +46432,85 @@ public DependentCoawaitExpr(global::CppSharp.Parser.AST.DependentCoawaitExpr _0)
 
             public unsafe partial class CoyieldExpr : global::CppSharp.Parser.AST.CoroutineSuspendExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr resumeExpr;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr operand;
 
                     [SuppressUnmanagedCodeSecurity]
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
index 93b02b0564..a11513965b 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
@@ -17334,151 +17334,24 @@ namespace Parser
     {
         namespace AST
         {
-            public enum StmtClass
-            {
-                NoStmt = 0,
-                GCCAsmStmt = 1,
-                MSAsmStmt = 2,
-                AttributedStmt = 3,
-                BreakStmt = 4,
-                CXXCatchStmt = 5,
-                CXXForRangeStmt = 6,
-                CXXTryStmt = 7,
-                CapturedStmt = 8,
-                CompoundStmt = 9,
-                ContinueStmt = 10,
-                CoreturnStmt = 11,
-                CoroutineBodyStmt = 12,
-                DeclStmt = 13,
-                DoStmt = 14,
-                BinaryConditionalOperator = 15,
-                ConditionalOperator = 16,
-                AddrLabelExpr = 17,
-                ArrayInitIndexExpr = 18,
-                ArrayInitLoopExpr = 19,
-                ArraySubscriptExpr = 20,
-                ArrayTypeTraitExpr = 21,
-                AsTypeExpr = 22,
-                AtomicExpr = 23,
-                BinaryOperator = 24,
-                CompoundAssignOperator = 25,
-                BlockExpr = 26,
-                CXXBindTemporaryExpr = 27,
-                CXXBoolLiteralExpr = 28,
-                CXXConstructExpr = 29,
-                CXXTemporaryObjectExpr = 30,
-                CXXDefaultArgExpr = 31,
-                CXXDefaultInitExpr = 32,
-                CXXDeleteExpr = 33,
-                CXXDependentScopeMemberExpr = 34,
-                CXXFoldExpr = 35,
-                CXXInheritedCtorInitExpr = 36,
-                CXXNewExpr = 37,
-                CXXNoexceptExpr = 38,
-                CXXNullPtrLiteralExpr = 39,
-                CXXPseudoDestructorExpr = 40,
-                CXXScalarValueInitExpr = 41,
-                CXXStdInitializerListExpr = 42,
-                CXXThisExpr = 43,
-                CXXThrowExpr = 44,
-                CXXTypeidExpr = 45,
-                CXXUnresolvedConstructExpr = 46,
-                CXXUuidofExpr = 47,
-                CallExpr = 48,
-                CUDAKernelCallExpr = 49,
-                CXXMemberCallExpr = 50,
-                CXXOperatorCallExpr = 51,
-                UserDefinedLiteral = 52,
-                CStyleCastExpr = 53,
-                CXXFunctionalCastExpr = 54,
-                CXXConstCastExpr = 55,
-                CXXDynamicCastExpr = 56,
-                CXXReinterpretCastExpr = 57,
-                CXXStaticCastExpr = 58,
-                ImplicitCastExpr = 60,
-                CharacterLiteral = 61,
-                ChooseExpr = 62,
-                CompoundLiteralExpr = 63,
-                ConvertVectorExpr = 64,
-                CoawaitExpr = 65,
-                CoyieldExpr = 66,
-                DeclRefExpr = 67,
-                DependentCoawaitExpr = 68,
-                DependentScopeDeclRefExpr = 69,
-                DesignatedInitExpr = 70,
-                DesignatedInitUpdateExpr = 71,
-                ExpressionTraitExpr = 72,
-                ExtVectorElementExpr = 73,
-                FixedPointLiteral = 74,
-                FloatingLiteral = 75,
-                ConstantExpr = 76,
-                ExprWithCleanups = 77,
-                FunctionParmPackExpr = 78,
-                GNUNullExpr = 79,
-                GenericSelectionExpr = 80,
-                ImaginaryLiteral = 81,
-                ImplicitValueInitExpr = 82,
-                InitListExpr = 83,
-                IntegerLiteral = 84,
-                LambdaExpr = 85,
-                MSPropertyRefExpr = 86,
-                MSPropertySubscriptExpr = 87,
-                MaterializeTemporaryExpr = 88,
-                MemberExpr = 89,
-                NoInitExpr = 90,
-                OffsetOfExpr = 107,
-                OpaqueValueExpr = 108,
-                UnresolvedLookupExpr = 109,
-                UnresolvedMemberExpr = 110,
-                PackExpansionExpr = 111,
-                ParenExpr = 112,
-                ParenListExpr = 113,
-                PredefinedExpr = 114,
-                PseudoObjectExpr = 115,
-                ShuffleVectorExpr = 116,
-                SizeOfPackExpr = 117,
-                StmtExpr = 118,
-                StringLiteral = 119,
-                SubstNonTypeTemplateParmExpr = 120,
-                SubstNonTypeTemplateParmPackExpr = 121,
-                TypeTraitExpr = 122,
-                TypoExpr = 123,
-                UnaryExprOrTypeTraitExpr = 124,
-                UnaryOperator = 125,
-                VAArgExpr = 126,
-                ForStmt = 127,
-                GotoStmt = 128,
-                IfStmt = 129,
-                IndirectGotoStmt = 130,
-                LabelStmt = 131,
-                MSDependentExistsStmt = 132,
-                NullStmt = 133,
-                ReturnStmt = 188,
-                SEHExceptStmt = 189,
-                SEHFinallyStmt = 190,
-                SEHLeaveStmt = 191,
-                SEHTryStmt = 192,
-                CaseStmt = 193,
-                DefaultStmt = 194,
-                SwitchStmt = 195,
-                WhileStmt = 196
-            }
-
             public unsafe partial class Stmt : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+
+                    [FieldOffset(24)]
                     internal global::System.IntPtr stripLabelLikeStatements;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17488,8 +17361,8 @@ public partial struct __Internal
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST4StmtC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST4StmtC2ENS2_9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -17497,6 +17370,136 @@ public partial struct __Internal
                     internal static extern void cctor(global::System.IntPtr __instance, global::System.IntPtr _0);
                 }
 
+                public enum StmtClass
+                {
+                    NoStmt = 0,
+                    GCCAsmStmt = 1,
+                    MSAsmStmt = 2,
+                    AttributedStmt = 3,
+                    BreakStmt = 4,
+                    CXXCatchStmt = 5,
+                    CXXForRangeStmt = 6,
+                    CXXTryStmt = 7,
+                    CapturedStmt = 8,
+                    CompoundStmt = 9,
+                    ContinueStmt = 10,
+                    CoreturnStmt = 11,
+                    CoroutineBodyStmt = 12,
+                    DeclStmt = 13,
+                    DoStmt = 14,
+                    BinaryConditionalOperator = 15,
+                    ConditionalOperator = 16,
+                    AddrLabelExpr = 17,
+                    ArrayInitIndexExpr = 18,
+                    ArrayInitLoopExpr = 19,
+                    ArraySubscriptExpr = 20,
+                    ArrayTypeTraitExpr = 21,
+                    AsTypeExpr = 22,
+                    AtomicExpr = 23,
+                    BinaryOperator = 24,
+                    CompoundAssignOperator = 25,
+                    BlockExpr = 26,
+                    CXXBindTemporaryExpr = 27,
+                    CXXBoolLiteralExpr = 28,
+                    CXXConstructExpr = 29,
+                    CXXTemporaryObjectExpr = 30,
+                    CXXDefaultArgExpr = 31,
+                    CXXDefaultInitExpr = 32,
+                    CXXDeleteExpr = 33,
+                    CXXDependentScopeMemberExpr = 34,
+                    CXXFoldExpr = 35,
+                    CXXInheritedCtorInitExpr = 36,
+                    CXXNewExpr = 37,
+                    CXXNoexceptExpr = 38,
+                    CXXNullPtrLiteralExpr = 39,
+                    CXXPseudoDestructorExpr = 40,
+                    CXXScalarValueInitExpr = 41,
+                    CXXStdInitializerListExpr = 42,
+                    CXXThisExpr = 43,
+                    CXXThrowExpr = 44,
+                    CXXTypeidExpr = 45,
+                    CXXUnresolvedConstructExpr = 46,
+                    CXXUuidofExpr = 47,
+                    CallExpr = 48,
+                    CUDAKernelCallExpr = 49,
+                    CXXMemberCallExpr = 50,
+                    CXXOperatorCallExpr = 51,
+                    UserDefinedLiteral = 52,
+                    CStyleCastExpr = 53,
+                    CXXFunctionalCastExpr = 54,
+                    CXXConstCastExpr = 55,
+                    CXXDynamicCastExpr = 56,
+                    CXXReinterpretCastExpr = 57,
+                    CXXStaticCastExpr = 58,
+                    ImplicitCastExpr = 60,
+                    CharacterLiteral = 61,
+                    ChooseExpr = 62,
+                    CompoundLiteralExpr = 63,
+                    ConvertVectorExpr = 64,
+                    CoawaitExpr = 65,
+                    CoyieldExpr = 66,
+                    DeclRefExpr = 67,
+                    DependentCoawaitExpr = 68,
+                    DependentScopeDeclRefExpr = 69,
+                    DesignatedInitExpr = 70,
+                    DesignatedInitUpdateExpr = 71,
+                    ExpressionTraitExpr = 72,
+                    ExtVectorElementExpr = 73,
+                    FixedPointLiteral = 74,
+                    FloatingLiteral = 75,
+                    ConstantExpr = 76,
+                    ExprWithCleanups = 77,
+                    FunctionParmPackExpr = 78,
+                    GNUNullExpr = 79,
+                    GenericSelectionExpr = 80,
+                    ImaginaryLiteral = 81,
+                    ImplicitValueInitExpr = 82,
+                    InitListExpr = 83,
+                    IntegerLiteral = 84,
+                    LambdaExpr = 85,
+                    MSPropertyRefExpr = 86,
+                    MSPropertySubscriptExpr = 87,
+                    MaterializeTemporaryExpr = 88,
+                    MemberExpr = 89,
+                    NoInitExpr = 90,
+                    OffsetOfExpr = 107,
+                    OpaqueValueExpr = 108,
+                    UnresolvedLookupExpr = 109,
+                    UnresolvedMemberExpr = 110,
+                    PackExpansionExpr = 111,
+                    ParenExpr = 112,
+                    ParenListExpr = 113,
+                    PredefinedExpr = 114,
+                    PseudoObjectExpr = 115,
+                    ShuffleVectorExpr = 116,
+                    SizeOfPackExpr = 117,
+                    StmtExpr = 118,
+                    StringLiteral = 119,
+                    SubstNonTypeTemplateParmExpr = 120,
+                    SubstNonTypeTemplateParmPackExpr = 121,
+                    TypeTraitExpr = 122,
+                    TypoExpr = 123,
+                    UnaryExprOrTypeTraitExpr = 124,
+                    UnaryOperator = 125,
+                    VAArgExpr = 126,
+                    ForStmt = 127,
+                    GotoStmt = 128,
+                    IfStmt = 129,
+                    IndirectGotoStmt = 130,
+                    LabelStmt = 131,
+                    MSDependentExistsStmt = 132,
+                    NullStmt = 133,
+                    ReturnStmt = 188,
+                    SEHExceptStmt = 189,
+                    SEHFinallyStmt = 190,
+                    SEHLeaveStmt = 191,
+                    SEHTryStmt = 192,
+                    CaseStmt = 193,
+                    DefaultStmt = 194,
+                    SwitchStmt = 195,
+                    WhileStmt = 196
+                }
+
                 public global::System.IntPtr __Instance { get; protected set; }
 
                 protected int __PointerAdjustment;
@@ -17544,7 +17547,7 @@ public Stmt()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public Stmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public Stmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.Stmt.__Internal));
                     __ownsNativeInstance = true;
@@ -17576,12 +17579,12 @@ public virtual void Dispose(bool disposing)
                     __Instance = IntPtr.Zero;
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.Stmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.Stmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.Stmt(klass);
                 }
 
-                public global::CppSharp.Parser.AST.StmtClass StmtClass
+                public global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass
                 {
                     get
                     {
@@ -17607,6 +17610,19 @@ public virtual void Dispose(bool disposing)
                     }
                 }
 
+                public global::CppSharp.Parser.SourceLocation BeginLoc
+                {
+                    get
+                    {
+                        return global::CppSharp.Parser.SourceLocation.__CreateInstance(((global::CppSharp.Parser.AST.Stmt.__Internal*) __Instance)->beginLoc);
+                    }
+
+                    set
+                    {
+                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->beginLoc = value.__Instance;
+                    }
+                }
+
                 public global::CppSharp.Parser.SourceLocation EndLoc
                 {
                     get
@@ -17641,28 +17657,31 @@ public virtual void Dispose(bool disposing)
 
             public unsafe partial class DeclStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ decls;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isSingleDecl;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr singleDecl;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17835,25 +17854,28 @@ public uint GetdeclsCount
 
             public unsafe partial class NullStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal semiLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal byte hasLeadingEmptyMacro;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17947,40 +17969,43 @@ public bool HasLeadingEmptyMacro
 
             public unsafe partial class CompoundStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_S_allocator__S0_ body;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte body_empty;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal uint size;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr body_front;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr body_back;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBracLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18210,28 +18235,31 @@ public uint GetbodyCount
 
             public unsafe partial class SwitchCase : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18241,8 +18269,8 @@ public unsafe partial class SwitchCase : global::CppSharp.Parser.AST.Stmt, IDisp
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST10SwitchCaseC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST10SwitchCaseC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -18292,7 +18320,7 @@ public SwitchCase()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public SwitchCase(global::CppSharp.Parser.AST.StmtClass klass)
+                public SwitchCase(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.SwitchCase.__Internal));
@@ -18310,7 +18338,7 @@ public SwitchCase(global::CppSharp.Parser.AST.SwitchCase _0)
                     *((global::CppSharp.Parser.AST.SwitchCase.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.SwitchCase.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.SwitchCase(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.SwitchCase(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.SwitchCase(klass);
                 }
@@ -18362,43 +18390,46 @@ public SwitchCase(global::CppSharp.Parser.AST.SwitchCase _0)
 
             public unsafe partial class CaseStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal caseLoc;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal byte caseStmtIsGNURange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18541,31 +18572,34 @@ public bool CaseStmtIsGNURange
 
             public unsafe partial class DefaultStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal defaultLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18646,28 +18680,31 @@ public DefaultStmt(global::CppSharp.Parser.AST.DefaultStmt _0)
 
             public unsafe partial class LabelStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal identLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr subStmt;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal identLoc;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr subStmt;
+
+                    [FieldOffset(48)]
                     internal global::System.IntPtr name;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18779,25 +18816,28 @@ public string Name
 
             public unsafe partial class AttributedStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal attrLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal attrLoc;
+
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18896,55 +18936,58 @@ public AttributedStmt(global::CppSharp.Parser.AST.AttributedStmt _0)
 
             public unsafe partial class IfStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr then;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr _else;
+                    internal global::System.IntPtr then;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr _else;
 
                     [FieldOffset(56)]
+                    internal global::System.IntPtr init;
+
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ifLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal elseLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal byte _constexpr;
 
-                    [FieldOffset(65)]
+                    [FieldOffset(73)]
                     internal byte hasInitStorage;
 
-                    [FieldOffset(66)]
+                    [FieldOffset(74)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(67)]
+                    [FieldOffset(75)]
                     internal byte hasElseStorage;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte isObjCAvailabilityCheck;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19193,43 +19236,46 @@ public bool IsObjCAvailabilityCheck
 
             public unsafe partial class SwitchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(48)]
+                    internal global::System.IntPtr init;
+
+                    [FieldOffset(56)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal switchLoc;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte hasInitStorage;
 
-                    [FieldOffset(53)]
+                    [FieldOffset(61)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal byte isAllEnumCasesCovered;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19421,34 +19467,37 @@ public bool IsAllEnumCasesCovered
 
             public unsafe partial class WhileStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr body;
+
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19596,34 +19645,37 @@ public bool HasVarStorage
 
             public unsafe partial class DoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr body;
+
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal doLoc;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19766,43 +19818,46 @@ public DoStmt(global::CppSharp.Parser.AST.DoStmt _0)
 
             public unsafe partial class ForStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr inc;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr inc;
 
                     [FieldOffset(56)]
+                    internal global::System.IntPtr body;
+
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19999,25 +20054,28 @@ public ForStmt(global::CppSharp.Parser.AST.ForStmt _0)
 
             public unsafe partial class GotoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal labelLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20111,28 +20169,31 @@ public GotoStmt(global::CppSharp.Parser.AST.GotoStmt _0)
 
             public unsafe partial class IndirectGotoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal starLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr target;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20244,23 +20305,26 @@ public IndirectGotoStmt(global::CppSharp.Parser.AST.IndirectGotoStmt _0)
 
             public unsafe partial class ContinueStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal continueLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal continueLoc;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -20340,22 +20404,25 @@ public ContinueStmt(global::CppSharp.Parser.AST.ContinueStmt _0)
 
             public unsafe partial class BreakStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal breakLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20436,25 +20503,28 @@ public BreakStmt(global::CppSharp.Parser.AST.BreakStmt _0)
 
             public unsafe partial class ReturnStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr retValue;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::System.IntPtr retValue;
+
+                    [FieldOffset(40)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal returnLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20553,46 +20623,49 @@ public ReturnStmt(global::CppSharp.Parser.AST.ReturnStmt _0)
 
             public unsafe partial class AsmStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal byte simple;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(85)]
                     internal byte _volatile;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numOutputs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numInputs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numClobbers;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20602,8 +20675,8 @@ public unsafe partial class AsmStmt : global::CppSharp.Parser.AST.Stmt, IDisposa
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST7AsmStmtC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST7AsmStmtC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -20698,7 +20771,7 @@ public AsmStmt()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public AsmStmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public AsmStmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.AsmStmt.__Internal));
@@ -20780,7 +20853,7 @@ public void Clearoutputs()
                     __Internal.Clearoutputs((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.AsmStmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.AsmStmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.AsmStmt(klass);
                 }
@@ -20897,49 +20970,52 @@ public uint GetoutputsCount
 
             public unsafe partial class GCCAsmStmt : global::CppSharp.Parser.AST.AsmStmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal byte simple;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(85)]
                     internal byte _volatile;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numOutputs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numInputs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numClobbers;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21228,58 +21304,61 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class MSAsmStmt : global::CppSharp.Parser.AST.AsmStmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal byte simple;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(85)]
                     internal byte _volatile;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numOutputs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numInputs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numClobbers;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBraceLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte hasBraces;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numAsmToks;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C asmString;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21423,28 +21502,31 @@ public string AsmString
 
             public unsafe partial class SEHExceptStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal exceptLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr filterExpr;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal exceptLoc;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr filterExpr;
+
+                    [FieldOffset(48)]
                     internal global::System.IntPtr block;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21561,25 +21643,28 @@ public SEHExceptStmt(global::CppSharp.Parser.AST.SEHExceptStmt _0)
 
             public unsafe partial class SEHFinallyStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal finallyLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal finallyLoc;
+
+                    [FieldOffset(40)]
                     internal global::System.IntPtr block;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21678,37 +21763,40 @@ public SEHFinallyStmt(global::CppSharp.Parser.AST.SEHFinallyStmt _0)
 
             public unsafe partial class SEHTryStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal byte isCXXTry;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr tryBlock;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr handler;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr exceptHandler;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr finallyHandler;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21874,22 +21962,25 @@ public bool IsCXXTry
 
             public unsafe partial class SEHLeaveStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal leaveLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21970,28 +22061,31 @@ public SEHLeaveStmt(global::CppSharp.Parser.AST.SEHLeaveStmt _0)
 
             public unsafe partial class CapturedStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ capture_inits;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr capturedStmt;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal uint capture_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22356,28 +22450,31 @@ public uint GetcaptureInitsCount
 
             public unsafe partial class CXXCatchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal catchLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal catchLoc;
+
+                    [FieldOffset(40)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal caughtType;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr handlerBlock;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22489,28 +22586,31 @@ public CXXCatchStmt(global::CppSharp.Parser.AST.CXXCatchStmt _0)
 
             public unsafe partial class CXXTryStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr tryBlock;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr tryBlock;
+
+                    [FieldOffset(48)]
                     internal uint numHandlers;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22622,58 +22722,61 @@ public uint NumHandlers
 
             public unsafe partial class CXXForRangeStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr rangeInit;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr rangeInit;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr inc;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(56)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr inc;
 
                     [FieldOffset(64)]
-                    internal global::System.IntPtr rangeStmt;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(72)]
-                    internal global::System.IntPtr beginStmt;
+                    internal global::System.IntPtr rangeStmt;
 
                     [FieldOffset(80)]
-                    internal global::System.IntPtr endStmt;
+                    internal global::System.IntPtr beginStmt;
 
                     [FieldOffset(88)]
-                    internal global::System.IntPtr loopVarStmt;
+                    internal global::System.IntPtr endStmt;
 
                     [FieldOffset(96)]
+                    internal global::System.IntPtr loopVarStmt;
+
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal coawaitLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22955,31 +23058,34 @@ public CXXForRangeStmt(global::CppSharp.Parser.AST.CXXForRangeStmt _0)
 
             public unsafe partial class MSDependentExistsStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal byte isIfExists;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(37)]
                     internal byte isIfNotExists;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23104,58 +23210,61 @@ public bool IsIfNotExists
 
             public unsafe partial class CoroutineBodyStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal byte hasDependentPromiseType;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal byte hasDependentPromiseType;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr promiseDeclStmt;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr initSuspendStmt;
+                    internal global::System.IntPtr promiseDeclStmt;
 
                     [FieldOffset(56)]
-                    internal global::System.IntPtr finalSuspendStmt;
+                    internal global::System.IntPtr initSuspendStmt;
 
                     [FieldOffset(64)]
-                    internal global::System.IntPtr exceptionHandler;
+                    internal global::System.IntPtr finalSuspendStmt;
 
                     [FieldOffset(72)]
-                    internal global::System.IntPtr fallthroughHandler;
+                    internal global::System.IntPtr exceptionHandler;
 
                     [FieldOffset(80)]
-                    internal global::System.IntPtr allocate;
+                    internal global::System.IntPtr fallthroughHandler;
 
                     [FieldOffset(88)]
-                    internal global::System.IntPtr deallocate;
+                    internal global::System.IntPtr allocate;
 
                     [FieldOffset(96)]
-                    internal global::System.IntPtr returnValueInit;
+                    internal global::System.IntPtr deallocate;
 
                     [FieldOffset(104)]
-                    internal global::System.IntPtr resultDecl;
+                    internal global::System.IntPtr returnValueInit;
 
                     [FieldOffset(112)]
-                    internal global::System.IntPtr returnStmt;
+                    internal global::System.IntPtr resultDecl;
 
                     [FieldOffset(120)]
+                    internal global::System.IntPtr returnStmt;
+
+                    [FieldOffset(128)]
                     internal global::System.IntPtr returnStmtOnAllocFailure;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23557,31 +23666,34 @@ public bool HasDependentPromiseType
 
             public unsafe partial class CoreturnStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal byte isImplicit;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr promiseCall;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23911,61 +24023,64 @@ public enum UnaryExprOrTypeTrait
 
             public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23975,8 +24090,8 @@ public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST4ExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST4ExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -24337,7 +24452,7 @@ public Expr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public Expr(global::CppSharp.Parser.AST.StmtClass klass)
+                public Expr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.Expr.__Internal));
@@ -24355,7 +24470,7 @@ public Expr(global::CppSharp.Parser.AST.Expr _0)
                     *((global::CppSharp.Parser.AST.Expr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.Expr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.Expr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.Expr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.Expr(klass);
                 }
@@ -24555,64 +24670,67 @@ public bool HasPlaceholderType
 
             public unsafe partial class FullExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -24622,8 +24740,8 @@ public unsafe partial class FullExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST8FullExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST8FullExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -24673,7 +24791,7 @@ public FullExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public FullExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public FullExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.FullExpr.__Internal));
@@ -24691,7 +24809,7 @@ public FullExpr(global::CppSharp.Parser.AST.FullExpr _0)
                     *((global::CppSharp.Parser.AST.FullExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.FullExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.FullExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.FullExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.FullExpr(klass);
                 }
@@ -24717,64 +24835,67 @@ public FullExpr(global::CppSharp.Parser.AST.FullExpr _0)
 
             public unsafe partial class ConstantExpr : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -24842,70 +24963,73 @@ public ConstantExpr(global::CppSharp.Parser.AST.ConstantExpr _0)
 
             public unsafe partial class OpaqueValueExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte isUnique;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr sourceExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25017,97 +25141,100 @@ public bool IsUnique
 
             public unsafe partial class DeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(81)]
+                    [FieldOffset(89)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr foundDecl;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hasTemplateKWAndArgsInfo;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(113)]
+                    [FieldOffset(121)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte refersToEnclosingVariableOrCapture;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25336,67 +25463,70 @@ public bool RefersToEnclosingVariableOrCapture
 
             public unsafe partial class IntegerLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal ulong value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25490,67 +25620,70 @@ public ulong Value
 
             public unsafe partial class FixedPointLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal ulong value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25644,70 +25777,73 @@ public ulong Value
 
             public unsafe partial class CharacterLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.CharacterLiteral.CharacterKind kind;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25823,70 +25959,73 @@ public uint Value
 
             public unsafe partial class FloatingLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte exact;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal double valueAsApproximateDouble;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25993,64 +26132,67 @@ public double ValueAsApproximateDouble
 
             public unsafe partial class ImaginaryLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26136,106 +26278,109 @@ public ImaginaryLiteral(global::CppSharp.Parser.AST.ImaginaryLiteral _0)
 
             public unsafe partial class StringLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C bytes;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal uint byteLength;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal uint length;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint charByteWidth;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.AST.StringLiteral.StringKind kind;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte isAscii;
 
-                    [FieldOffset(113)]
+                    [FieldOffset(121)]
                     internal byte isWide;
 
-                    [FieldOffset(114)]
+                    [FieldOffset(122)]
                     internal byte isUTF8;
 
-                    [FieldOffset(115)]
+                    [FieldOffset(123)]
                     internal byte isUTF16;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal byte isUTF32;
 
-                    [FieldOffset(117)]
+                    [FieldOffset(125)]
                     internal byte isPascal;
 
-                    [FieldOffset(118)]
+                    [FieldOffset(126)]
                     internal byte containsNonAscii;
 
-                    [FieldOffset(119)]
+                    [FieldOffset(127)]
                     internal byte containsNonAsciiOrNull;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal uint numConcatenated;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26534,67 +26679,70 @@ public uint NumConcatenated
 
             public unsafe partial class PredefinedExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.PredefinedExpr.IdentKind identKind;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26700,70 +26848,73 @@ public PredefinedExpr(global::CppSharp.Parser.AST.PredefinedExpr _0)
 
             public unsafe partial class ParenExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParen;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParen;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26875,91 +27026,94 @@ public ParenExpr(global::CppSharp.Parser.AST.ParenExpr _0)
 
             public unsafe partial class UnaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.UnaryOperatorKind opcode;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte canOverflow;
 
-                    [FieldOffset(93)]
+                    [FieldOffset(101)]
                     internal byte isPrefix;
 
-                    [FieldOffset(94)]
+                    [FieldOffset(102)]
                     internal byte isPostfix;
 
-                    [FieldOffset(95)]
+                    [FieldOffset(103)]
                     internal byte isIncrementOp;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte isDecrementOp;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte isIncrementDecrementOp;
 
-                    [FieldOffset(98)]
+                    [FieldOffset(106)]
                     internal byte isArithmeticOp;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27162,73 +27316,76 @@ public bool IsArithmeticOp
 
             public unsafe partial class OffsetOfExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numComponents;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numExpressions;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27348,82 +27505,85 @@ public uint NumExpressions
 
             public unsafe partial class UnaryExprOrTypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.UnaryExprOrTypeTrait kind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte isArgumentType;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal argumentType;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr argumentExpr;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeOfArgument;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27587,76 +27747,79 @@ public bool IsArgumentType
 
             public unsafe partial class ArraySubscriptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracketLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr idx;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27809,88 +27972,91 @@ public ArraySubscriptExpr(global::CppSharp.Parser.AST.ArraySubscriptExpr _0)
 
             public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27900,8 +28066,8 @@ public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST8CallExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST8CallExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -27976,7 +28142,7 @@ public CallExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CallExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CallExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CallExpr.__Internal));
@@ -28034,7 +28200,7 @@ public void Cleararguments()
                     __Internal.Cleararguments((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CallExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CallExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CallExpr(klass);
                 }
@@ -28170,100 +28336,103 @@ public uint GetargumentsCount
 
             public unsafe partial class MemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte arrow;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(113)]
+                    [FieldOffset(121)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal byte isImplicitAccess;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28505,70 +28674,73 @@ public bool IsImplicitAccess
 
             public unsafe partial class CompoundLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr initializer;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte fileScope;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28680,82 +28852,85 @@ public bool FileScope
 
             public unsafe partial class CastExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28765,8 +28940,8 @@ public unsafe partial class CastExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST8CastExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST8CastExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -28816,7 +28991,7 @@ public CastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CastExpr.__Internal));
@@ -28834,7 +29009,7 @@ public CastExpr(global::CppSharp.Parser.AST.CastExpr _0)
                     *((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CastExpr(klass);
                 }
@@ -28948,85 +29123,88 @@ public uint PathSize
 
             public unsafe partial class ImplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte isPartOfExplicitCast;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29112,85 +29290,88 @@ public bool IsPartOfExplicitCast
 
             public unsafe partial class ExplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29200,8 +29381,8 @@ public unsafe partial class ExplicitCastExpr : global::CppSharp.Parser.AST.CastE
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST16ExplicitCastExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST16ExplicitCastExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -29251,7 +29432,7 @@ public ExplicitCastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public ExplicitCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public ExplicitCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal));
@@ -29269,7 +29450,7 @@ public ExplicitCastExpr(global::CppSharp.Parser.AST.ExplicitCastExpr _0)
                     *((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.ExplicitCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.ExplicitCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.ExplicitCastExpr(klass);
                 }
@@ -29290,91 +29471,94 @@ public ExplicitCastExpr(global::CppSharp.Parser.AST.ExplicitCastExpr _0)
 
             public unsafe partial class CStyleCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 144)]
+                [StructLayout(LayoutKind.Explicit, Size = 152)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29468,118 +29652,121 @@ public CStyleCastExpr(global::CppSharp.Parser.AST.CStyleCastExpr _0)
 
             public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind opcode;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte isPtrMemOp;
 
-                    [FieldOffset(113)]
+                    [FieldOffset(121)]
                     internal byte isMultiplicativeOp;
 
-                    [FieldOffset(114)]
+                    [FieldOffset(122)]
                     internal byte isAdditiveOp;
 
-                    [FieldOffset(115)]
+                    [FieldOffset(123)]
                     internal byte isShiftOp;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal byte isBitwiseOp;
 
-                    [FieldOffset(117)]
+                    [FieldOffset(125)]
                     internal byte isRelationalOp;
 
-                    [FieldOffset(118)]
+                    [FieldOffset(126)]
                     internal byte isEqualityOp;
 
-                    [FieldOffset(119)]
+                    [FieldOffset(127)]
                     internal byte isComparisonOp;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte isLogicalOp;
 
-                    [FieldOffset(121)]
+                    [FieldOffset(129)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(122)]
+                    [FieldOffset(130)]
                     internal byte isCompoundAssignmentOp;
 
-                    [FieldOffset(123)]
+                    [FieldOffset(131)]
                     internal byte isShiftAssignOp;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal byte isFPContractableWithinStatement;
 
-                    [FieldOffset(125)]
+                    [FieldOffset(133)]
                     internal byte isFEnvAccessOn;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29589,8 +29776,8 @@ public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, I
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST14BinaryOperatorC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST14BinaryOperatorC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -29645,7 +29832,7 @@ public BinaryOperator()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public BinaryOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public BinaryOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.BinaryOperator.__Internal));
@@ -29679,7 +29866,7 @@ public override void Dispose(bool disposing)
                     __Instance = IntPtr.Zero;
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.BinaryOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.BinaryOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.BinaryOperator(klass);
                 }
@@ -29947,124 +30134,127 @@ public bool IsFEnvAccessOn
 
             public unsafe partial class CompoundAssignOperator : global::CppSharp.Parser.AST.BinaryOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind opcode;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte isPtrMemOp;
 
-                    [FieldOffset(113)]
+                    [FieldOffset(121)]
                     internal byte isMultiplicativeOp;
 
-                    [FieldOffset(114)]
+                    [FieldOffset(122)]
                     internal byte isAdditiveOp;
 
-                    [FieldOffset(115)]
+                    [FieldOffset(123)]
                     internal byte isShiftOp;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal byte isBitwiseOp;
 
-                    [FieldOffset(117)]
+                    [FieldOffset(125)]
                     internal byte isRelationalOp;
 
-                    [FieldOffset(118)]
+                    [FieldOffset(126)]
                     internal byte isEqualityOp;
 
-                    [FieldOffset(119)]
+                    [FieldOffset(127)]
                     internal byte isComparisonOp;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte isLogicalOp;
 
-                    [FieldOffset(121)]
+                    [FieldOffset(129)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(122)]
+                    [FieldOffset(130)]
                     internal byte isCompoundAssignmentOp;
 
-                    [FieldOffset(123)]
+                    [FieldOffset(131)]
                     internal byte isShiftAssignOp;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal byte isFPContractableWithinStatement;
 
-                    [FieldOffset(125)]
+                    [FieldOffset(133)]
                     internal byte isFEnvAccessOn;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal computationLHSType;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal computationResultType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30179,76 +30369,79 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class AbstractConditionalOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30258,8 +30451,8 @@ public unsafe partial class AbstractConditionalOperator : global::CppSharp.Parse
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST27AbstractConditionalOperatorC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST27AbstractConditionalOperatorC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -30309,7 +30502,7 @@ public AbstractConditionalOperator()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public AbstractConditionalOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public AbstractConditionalOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal));
@@ -30327,7 +30520,7 @@ public AbstractConditionalOperator(global::CppSharp.Parser.AST.AbstractCondition
                     *((global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.AbstractConditionalOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.AbstractConditionalOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.AbstractConditionalOperator(klass);
                 }
@@ -30415,82 +30608,85 @@ public AbstractConditionalOperator(global::CppSharp.Parser.AST.AbstractCondition
 
             public unsafe partial class ConditionalOperator : global::CppSharp.Parser.AST.AbstractConditionalOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr rHS;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30594,82 +30790,85 @@ public ConditionalOperator(global::CppSharp.Parser.AST.ConditionalOperator _0)
 
             public unsafe partial class BinaryConditionalOperator : global::CppSharp.Parser.AST.AbstractConditionalOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr common;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr opaqueValue;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30773,67 +30972,70 @@ public BinaryConditionalOperator(global::CppSharp.Parser.AST.BinaryConditionalOp
 
             public unsafe partial class AddrLabelExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ampAmpLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal labelLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30927,70 +31129,73 @@ public AddrLabelExpr(global::CppSharp.Parser.AST.AddrLabelExpr _0)
 
             public unsafe partial class StmtExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subStmt;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31102,70 +31307,73 @@ public StmtExpr(global::CppSharp.Parser.AST.StmtExpr _0)
 
             public unsafe partial class ShuffleVectorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numSubExprs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31272,70 +31480,73 @@ public uint NumSubExprs
 
             public unsafe partial class ConvertVectorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr srcExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31447,85 +31658,88 @@ public ConvertVectorExpr(global::CppSharp.Parser.AST.ConvertVectorExpr _0)
 
             public unsafe partial class ChooseExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte isConditionTrue;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte isConditionDependent;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr chosenSubExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31717,64 +31931,67 @@ public bool IsConditionDependent
 
             public unsafe partial class GNUNullExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tokenLocation;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31855,73 +32072,76 @@ public GNUNullExpr(global::CppSharp.Parser.AST.GNUNullExpr _0)
 
             public unsafe partial class VAArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte isMicrosoftABI;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -32046,97 +32266,100 @@ public bool IsMicrosoftABI
 
             public unsafe partial class InitListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr arrayFiller;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBraceLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBraceLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr syntacticForm;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numInits;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal byte hasArrayFiller;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(117)]
                     internal byte isExplicit;
 
-                    [FieldOffset(110)]
+                    [FieldOffset(118)]
                     internal byte isStringLiteralInit;
 
-                    [FieldOffset(111)]
+                    [FieldOffset(119)]
                     internal byte isTransparent;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte isSemanticForm;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr semanticForm;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isSyntacticForm;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -32375,79 +32598,82 @@ public bool IsSyntacticForm
 
             public unsafe partial class DesignatedInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal equalOrColonLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr init;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint size;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte usesGNUSyntax;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal uint numSubExprs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceRange.__Internal designatorsSourceRange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33043,61 +33269,64 @@ public uint NumSubExprs
 
             public unsafe partial class NoInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33165,67 +33394,70 @@ public NoInitExpr(global::CppSharp.Parser.AST.NoInitExpr _0)
 
             public unsafe partial class DesignatedInitUpdateExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr updater;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33329,67 +33561,70 @@ public DesignatedInitUpdateExpr(global::CppSharp.Parser.AST.DesignatedInitUpdate
 
             public unsafe partial class ArrayInitLoopExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33493,61 +33728,64 @@ public ArrayInitLoopExpr(global::CppSharp.Parser.AST.ArrayInitLoopExpr _0)
 
             public unsafe partial class ArrayInitIndexExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33615,61 +33853,64 @@ public ArrayInitIndexExpr(global::CppSharp.Parser.AST.ArrayInitIndexExpr _0)
 
             public unsafe partial class ImplicitValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33737,70 +33978,73 @@ public ImplicitValueInitExpr(global::CppSharp.Parser.AST.ImplicitValueInitExpr _
 
             public unsafe partial class ParenListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numExprs;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33907,85 +34151,88 @@ public uint NumExprs
 
             public unsafe partial class GenericSelectionExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numAssocs;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal genericLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal defaultLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr controllingExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal byte isResultDependent;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal uint resultIndex;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr resultExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34167,76 +34414,79 @@ public uint ResultIndex
 
             public unsafe partial class ExtVectorElementExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal accessorLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numElements;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte containsDuplicateElements;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte isArrow;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34374,67 +34624,70 @@ public bool IsArrow
 
             public unsafe partial class BlockExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal caretLocation;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr body;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34533,70 +34786,73 @@ public BlockExpr(global::CppSharp.Parser.AST.BlockExpr _0)
 
             public unsafe partial class AsTypeExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr srcExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34708,73 +34964,76 @@ public AsTypeExpr(global::CppSharp.Parser.AST.AsTypeExpr _0)
 
             public unsafe partial class PseudoObjectExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr syntacticForm;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint resultExprIndex;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr resultExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numSemanticExprs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34904,106 +35163,109 @@ public uint NumSemanticExprs
 
             public unsafe partial class AtomicExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 184)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr ptr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr order;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr scope;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr val1;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr orderFail;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr val2;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr weak;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal valueType;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.AtomicExpr.AtomicOp op;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal uint numSubExprs;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal byte isVolatile;
 
-                    [FieldOffset(161)]
+                    [FieldOffset(169)]
                     internal byte isCmpXChg;
 
-                    [FieldOffset(162)]
+                    [FieldOffset(170)]
                     internal byte isOpenCL;
 
-                    [FieldOffset(164)]
+                    [FieldOffset(172)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35351,61 +35613,64 @@ public bool IsOpenCL
 
             public unsafe partial class TypoExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35473,103 +35738,106 @@ public TypoExpr(global::CppSharp.Parser.AST.TypoExpr _0)
 
             public unsafe partial class CXXOperatorCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.OverloadedOperatorKind _operator;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(157)]
+                    [FieldOffset(165)]
                     internal byte isInfixBinaryOp;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(164)]
+                    [FieldOffset(172)]
                     internal byte isFPContractableWithinStatement;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35723,94 +35991,97 @@ public bool IsFPContractableWithinStatement
 
             public unsafe partial class CXXMemberCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::System.IntPtr implicitObjectArgument;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::System.IntPtr methodDecl;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35935,91 +36206,94 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CUDAKernelCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::System.IntPtr config;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36126,97 +36400,100 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CXXNamedCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36226,8 +36503,8 @@ public unsafe partial class CXXNamedCastExpr : global::CppSharp.Parser.AST.Expli
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXNamedCastExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXNamedCastExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -36277,7 +36554,7 @@ public CXXNamedCastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CXXNamedCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CXXNamedCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal));
@@ -36295,7 +36572,7 @@ public CXXNamedCastExpr(global::CppSharp.Parser.AST.CXXNamedCastExpr _0)
                     *((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CXXNamedCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CXXNamedCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CXXNamedCastExpr(klass);
                 }
@@ -36355,97 +36632,100 @@ public string CastName
 
             public unsafe partial class CXXStaticCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36513,100 +36793,103 @@ public CXXStaticCastExpr(global::CppSharp.Parser.AST.CXXStaticCastExpr _0)
 
             public unsafe partial class CXXDynamicCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal byte isAlwaysNull;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36687,97 +36970,100 @@ public bool IsAlwaysNull
 
             public unsafe partial class CXXReinterpretCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36845,97 +37131,100 @@ public CXXReinterpretCastExpr(global::CppSharp.Parser.AST.CXXReinterpretCastExpr
 
             public unsafe partial class CXXConstCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37003,97 +37292,100 @@ public CXXConstCastExpr(global::CppSharp.Parser.AST.CXXConstCastExpr _0)
 
             public unsafe partial class UserDefinedLiteral : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 184)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.UserDefinedLiteral.LiteralOperatorKind literalOperatorKind;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::System.IntPtr cookedLiteral;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal uDSuffixLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37236,67 +37528,70 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CXXBoolLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte value;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37390,64 +37685,67 @@ public bool Value
 
             public unsafe partial class CXXNullPtrLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37528,64 +37826,67 @@ public CXXNullPtrLiteralExpr(global::CppSharp.Parser.AST.CXXNullPtrLiteralExpr _
 
             public unsafe partial class CXXStdInitializerListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37671,70 +37972,73 @@ public CXXStdInitializerListExpr(global::CppSharp.Parser.AST.CXXStdInitializerLi
 
             public unsafe partial class CXXTypeidExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr exprOperand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte isPotentiallyEvaluated;
 
-                    [FieldOffset(89)]
+                    [FieldOffset(97)]
                     internal byte isTypeOperand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37846,73 +38150,76 @@ public bool IsTypeOperand
 
             public unsafe partial class MSPropertyRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr baseExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte isArrow;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38037,70 +38344,73 @@ public bool IsArrow
 
             public unsafe partial class MSPropertySubscriptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracketLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr idx;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38217,70 +38527,73 @@ public MSPropertySubscriptExpr(global::CppSharp.Parser.AST.MSPropertySubscriptEx
 
             public unsafe partial class CXXUuidofExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr exprOperand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C uuidStr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte isTypeOperand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38416,67 +38729,70 @@ public bool IsTypeOperand
 
             public unsafe partial class CXXThisExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte @implicit;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38570,70 +38886,73 @@ public bool Implicit
 
             public unsafe partial class CXXThrowExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal throwLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte isThrownVariableInScope;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38745,67 +39064,70 @@ public bool IsThrownVariableInScope
 
             public unsafe partial class CXXDefaultArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr expr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal usedLocation;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38904,67 +39226,70 @@ public CXXDefaultArgExpr(global::CppSharp.Parser.AST.CXXDefaultArgExpr _0)
 
             public unsafe partial class CXXDefaultInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr field;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr expr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39068,64 +39393,67 @@ public CXXDefaultInitExpr(global::CppSharp.Parser.AST.CXXDefaultInitExpr _0)
 
             public unsafe partial class CXXBindTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39211,88 +39539,91 @@ public CXXBindTemporaryExpr(global::CppSharp.Parser.AST.CXXBindTemporaryExpr _0)
 
             public unsafe partial class CXXConstructExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal byte elidable;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(117)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(110)]
+                    [FieldOffset(118)]
                     internal byte listInitialization;
 
-                    [FieldOffset(111)]
+                    [FieldOffset(119)]
                     internal byte stdInitListInitialization;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte requiresZeroInitialization;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal global::CppSharp.Parser.SourceRange.__Internal parenOrBraceRange;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39302,8 +39633,8 @@ public unsafe partial class CXXConstructExpr : global::CppSharp.Parser.AST.Expr,
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXConstructExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST16CXXConstructExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -39386,7 +39717,7 @@ public CXXConstructExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CXXConstructExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CXXConstructExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CXXConstructExpr.__Internal));
@@ -39444,7 +39775,7 @@ public void Cleararguments()
                     __Internal.Cleararguments((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CXXConstructExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CXXConstructExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CXXConstructExpr(klass);
                 }
@@ -39565,70 +39896,73 @@ public uint GetargumentsCount
 
             public unsafe partial class CXXInheritedCtorInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte constructsVBase;
 
-                    [FieldOffset(74)]
+                    [FieldOffset(82)]
                     internal byte inheritedFromVBase;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39735,94 +40069,97 @@ public bool InheritedFromVBase
 
             public unsafe partial class CXXFunctionalCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte path_empty;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint path_size;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal byte isListInitialization;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39929,88 +40266,91 @@ public bool IsListInitialization
 
             public unsafe partial class CXXTemporaryObjectExpr : global::CppSharp.Parser.AST.CXXConstructExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal byte elidable;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(117)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(110)]
+                    [FieldOffset(118)]
                     internal byte listInitialization;
 
-                    [FieldOffset(111)]
+                    [FieldOffset(119)]
                     internal byte stdInitListInitialization;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte requiresZeroInitialization;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal global::CppSharp.Parser.SourceRange.__Internal parenOrBraceRange;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40099,91 +40439,94 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class LambdaExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ capture_inits;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal captureDefaultLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal uint capture_size;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceRange.__Internal introducerRange;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr callOperator;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isGenericLambda;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr body;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal byte isMutable;
 
-                    [FieldOffset(145)]
+                    [FieldOffset(153)]
                     internal byte hasExplicitParameters;
 
-                    [FieldOffset(146)]
+                    [FieldOffset(154)]
                     internal byte hasExplicitResultType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40452,64 +40795,67 @@ public uint GetcaptureInitsCount
 
             public unsafe partial class CXXScalarValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40590,106 +40936,109 @@ public CXXScalarValueInitExpr(global::CppSharp.Parser.AST.CXXScalarValueInitExpr
 
             public unsafe partial class CXXNewExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 200)]
+                [StructLayout(LayoutKind.Explicit, Size = 208)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ placement_arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr operatorNew;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr operatorDelete;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal allocatedType;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte isArray;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::System.IntPtr arraySize;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal uint numPlacementArgs;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal byte isParenTypeId;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::CppSharp.Parser.SourceRange.__Internal typeIdParens;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal byte isGlobalNew;
 
-                    [FieldOffset(169)]
+                    [FieldOffset(177)]
                     internal byte hasInitializer;
 
-                    [FieldOffset(172)]
+                    [FieldOffset(180)]
                     internal global::CppSharp.Parser.AST.CXXNewExpr.InitializationStyle initializationStyle;
 
-                    [FieldOffset(176)]
+                    [FieldOffset(184)]
                     internal global::System.IntPtr initializer;
 
-                    [FieldOffset(184)]
+                    [FieldOffset(192)]
                     internal global::System.IntPtr constructExpr;
 
-                    [FieldOffset(192)]
+                    [FieldOffset(200)]
                     internal global::CppSharp.Parser.SourceRange.__Internal directInitRange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41045,79 +41394,82 @@ public uint GetplacementArgumentsCount
 
             public unsafe partial class CXXDeleteExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte isGlobalDelete;
 
-                    [FieldOffset(74)]
+                    [FieldOffset(82)]
                     internal byte isArrayForm;
 
-                    [FieldOffset(75)]
+                    [FieldOffset(83)]
                     internal byte isArrayFormAsWritten;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr operatorDelete;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr argument;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal destroyedType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41273,85 +41625,88 @@ public bool IsArrayFormAsWritten
 
             public unsafe partial class CXXPseudoDestructorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(89)]
+                    [FieldOffset(97)]
                     internal byte isArrow;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonColonLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tildeLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal destroyedType;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal destroyedTypeLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41528,67 +41883,70 @@ public bool IsArrow
 
             public unsafe partial class TypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte value;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41682,70 +42040,73 @@ public uint NumArgs
 
             public unsafe partial class ArrayTypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal queriedType;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal ulong value;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr dimensionExpression;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41857,67 +42218,70 @@ public ulong Value
 
             public unsafe partial class ExpressionTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr queriedExpression;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42016,85 +42380,88 @@ public bool Value
 
             public unsafe partial class OverloadExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numDecls;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42104,8 +42471,8 @@ public unsafe partial class OverloadExpr : global::CppSharp.Parser.AST.Expr, IDi
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST12OverloadExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST12OverloadExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -42243,7 +42610,7 @@ public OverloadExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public OverloadExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public OverloadExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.OverloadExpr.__Internal));
@@ -42261,7 +42628,7 @@ public OverloadExpr(global::CppSharp.Parser.AST.OverloadExpr _0)
                     *((global::CppSharp.Parser.AST.OverloadExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.OverloadExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.OverloadExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.OverloadExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.OverloadExpr(klass);
                 }
@@ -42373,91 +42740,94 @@ public uint NumTemplateArgs
 
             public unsafe partial class UnresolvedLookupExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numDecls;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal byte requiresADL;
 
-                    [FieldOffset(105)]
+                    [FieldOffset(113)]
                     internal byte isOverloaded;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42551,82 +42921,85 @@ public bool IsOverloaded
 
             public unsafe partial class DependentScopeDeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(93)]
+                    [FieldOffset(101)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42785,70 +43158,73 @@ public uint NumTemplateArgs
 
             public unsafe partial class ExprWithCleanups : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numObjects;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte cleanupsHaveSideEffects;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42942,79 +43318,82 @@ public bool CleanupsHaveSideEffects
 
             public unsafe partial class CXXUnresolvedConstructExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isListInitialization;
 
-                    [FieldOffset(132)]
+                    [FieldOffset(140)]
                     internal uint arg_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43221,100 +43600,103 @@ public uint GetargumentsCount
 
             public unsafe partial class CXXDependentScopeMemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 144)]
+                [StructLayout(LayoutKind.Explicit, Size = 152)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(73)]
+                    [FieldOffset(81)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal baseType;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal byte isArrow;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr firstQualifierFoundInScope;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(132)]
+                    [FieldOffset(140)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(137)]
+                    [FieldOffset(145)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43561,106 +43943,109 @@ public uint NumTemplateArgs
 
             public unsafe partial class UnresolvedMemberExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal uint numDecls;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal baseType;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte hasUnresolvedUsing;
 
-                    [FieldOffset(137)]
+                    [FieldOffset(145)]
                     internal byte isArrow;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43824,67 +44209,70 @@ public bool IsArrow
 
             public unsafe partial class CXXNoexceptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43983,67 +44371,70 @@ public bool Value
 
             public unsafe partial class PackExpansionExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr pattern;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44142,79 +44533,82 @@ public PackExpansionExpr(global::CppSharp.Parser.AST.PackExpansionExpr _0)
 
             public unsafe partial class SizeOfPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal packLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr pack;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal uint packLength;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte isPartiallySubstituted;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44365,67 +44759,70 @@ public bool IsPartiallySubstituted
 
             public unsafe partial class SubstNonTypeTemplateParmExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr replacement;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44524,67 +44921,70 @@ public SubstNonTypeTemplateParmExpr(global::CppSharp.Parser.AST.SubstNonTypeTemp
 
             public unsafe partial class SubstNonTypeTemplateParmPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal parameterPackLocation;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.TemplateArgument.__Internal argumentPack;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44678,67 +45078,70 @@ public SubstNonTypeTemplateParmPackExpr(global::CppSharp.Parser.AST.SubstNonType
 
             public unsafe partial class FunctionParmPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal parameterPackLocation;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numExpansions;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44832,73 +45235,76 @@ public uint NumExpansions
 
             public unsafe partial class MaterializeTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr temporary;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr TemporaryExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal uint manglingNumber;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte isBoundToLvalueReference;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45116,85 +45522,88 @@ public bool IsBoundToLvalueReference
 
             public unsafe partial class CXXFoldExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte isRightFold;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte isLeftFold;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr pattern;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr init;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind _operator;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45386,79 +45795,82 @@ public bool IsLeftFold
 
             public unsafe partial class CoroutineSuspendExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr resumeExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45468,8 +45880,8 @@ public unsafe partial class CoroutineSuspendExpr : global::CppSharp.Parser.AST.E
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="_ZN8CppSharp9CppParser3AST20CoroutineSuspendExprC2ENS1_9StmtClassE")]
-                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="_ZN8CppSharp9CppParser3AST20CoroutineSuspendExprC2ENS1_4Stmt9StmtClassE")]
+                    internal static extern void ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -45528,7 +45940,7 @@ public CoroutineSuspendExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CoroutineSuspendExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CoroutineSuspendExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal));
@@ -45546,7 +45958,7 @@ public CoroutineSuspendExpr(global::CppSharp.Parser.AST.CoroutineSuspendExpr _0)
                     *((global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CoroutineSuspendExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CoroutineSuspendExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CoroutineSuspendExpr(klass);
                 }
@@ -45657,85 +46069,88 @@ public CoroutineSuspendExpr(global::CppSharp.Parser.AST.CoroutineSuspendExpr _0)
 
             public unsafe partial class CoawaitExpr : global::CppSharp.Parser.AST.CoroutineSuspendExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr resumeExpr;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte isImplicit;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr operand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45834,70 +46249,73 @@ public bool IsImplicit
 
             public unsafe partial class DependentCoawaitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr operatorCoawaitLookup;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -46014,82 +46432,85 @@ public DependentCoawaitExpr(global::CppSharp.Parser.AST.DependentCoawaitExpr _0)
 
             public unsafe partial class CoyieldExpr : global::CppSharp.Parser.AST.CoroutineSuspendExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr resumeExpr;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr operand;
 
                     [SuppressUnmanagedCodeSecurity]
diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
index 41f529234f..4a3e1a7c1e 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
@@ -17335,151 +17335,24 @@ namespace Parser
     {
         namespace AST
         {
-            public enum StmtClass
-            {
-                NoStmt = 0,
-                GCCAsmStmt = 1,
-                MSAsmStmt = 2,
-                AttributedStmt = 3,
-                BreakStmt = 4,
-                CXXCatchStmt = 5,
-                CXXForRangeStmt = 6,
-                CXXTryStmt = 7,
-                CapturedStmt = 8,
-                CompoundStmt = 9,
-                ContinueStmt = 10,
-                CoreturnStmt = 11,
-                CoroutineBodyStmt = 12,
-                DeclStmt = 13,
-                DoStmt = 14,
-                BinaryConditionalOperator = 15,
-                ConditionalOperator = 16,
-                AddrLabelExpr = 17,
-                ArrayInitIndexExpr = 18,
-                ArrayInitLoopExpr = 19,
-                ArraySubscriptExpr = 20,
-                ArrayTypeTraitExpr = 21,
-                AsTypeExpr = 22,
-                AtomicExpr = 23,
-                BinaryOperator = 24,
-                CompoundAssignOperator = 25,
-                BlockExpr = 26,
-                CXXBindTemporaryExpr = 27,
-                CXXBoolLiteralExpr = 28,
-                CXXConstructExpr = 29,
-                CXXTemporaryObjectExpr = 30,
-                CXXDefaultArgExpr = 31,
-                CXXDefaultInitExpr = 32,
-                CXXDeleteExpr = 33,
-                CXXDependentScopeMemberExpr = 34,
-                CXXFoldExpr = 35,
-                CXXInheritedCtorInitExpr = 36,
-                CXXNewExpr = 37,
-                CXXNoexceptExpr = 38,
-                CXXNullPtrLiteralExpr = 39,
-                CXXPseudoDestructorExpr = 40,
-                CXXScalarValueInitExpr = 41,
-                CXXStdInitializerListExpr = 42,
-                CXXThisExpr = 43,
-                CXXThrowExpr = 44,
-                CXXTypeidExpr = 45,
-                CXXUnresolvedConstructExpr = 46,
-                CXXUuidofExpr = 47,
-                CallExpr = 48,
-                CUDAKernelCallExpr = 49,
-                CXXMemberCallExpr = 50,
-                CXXOperatorCallExpr = 51,
-                UserDefinedLiteral = 52,
-                CStyleCastExpr = 53,
-                CXXFunctionalCastExpr = 54,
-                CXXConstCastExpr = 55,
-                CXXDynamicCastExpr = 56,
-                CXXReinterpretCastExpr = 57,
-                CXXStaticCastExpr = 58,
-                ImplicitCastExpr = 60,
-                CharacterLiteral = 61,
-                ChooseExpr = 62,
-                CompoundLiteralExpr = 63,
-                ConvertVectorExpr = 64,
-                CoawaitExpr = 65,
-                CoyieldExpr = 66,
-                DeclRefExpr = 67,
-                DependentCoawaitExpr = 68,
-                DependentScopeDeclRefExpr = 69,
-                DesignatedInitExpr = 70,
-                DesignatedInitUpdateExpr = 71,
-                ExpressionTraitExpr = 72,
-                ExtVectorElementExpr = 73,
-                FixedPointLiteral = 74,
-                FloatingLiteral = 75,
-                ConstantExpr = 76,
-                ExprWithCleanups = 77,
-                FunctionParmPackExpr = 78,
-                GNUNullExpr = 79,
-                GenericSelectionExpr = 80,
-                ImaginaryLiteral = 81,
-                ImplicitValueInitExpr = 82,
-                InitListExpr = 83,
-                IntegerLiteral = 84,
-                LambdaExpr = 85,
-                MSPropertyRefExpr = 86,
-                MSPropertySubscriptExpr = 87,
-                MaterializeTemporaryExpr = 88,
-                MemberExpr = 89,
-                NoInitExpr = 90,
-                OffsetOfExpr = 107,
-                OpaqueValueExpr = 108,
-                UnresolvedLookupExpr = 109,
-                UnresolvedMemberExpr = 110,
-                PackExpansionExpr = 111,
-                ParenExpr = 112,
-                ParenListExpr = 113,
-                PredefinedExpr = 114,
-                PseudoObjectExpr = 115,
-                ShuffleVectorExpr = 116,
-                SizeOfPackExpr = 117,
-                StmtExpr = 118,
-                StringLiteral = 119,
-                SubstNonTypeTemplateParmExpr = 120,
-                SubstNonTypeTemplateParmPackExpr = 121,
-                TypeTraitExpr = 122,
-                TypoExpr = 123,
-                UnaryExprOrTypeTraitExpr = 124,
-                UnaryOperator = 125,
-                VAArgExpr = 126,
-                ForStmt = 127,
-                GotoStmt = 128,
-                IfStmt = 129,
-                IndirectGotoStmt = 130,
-                LabelStmt = 131,
-                MSDependentExistsStmt = 132,
-                NullStmt = 133,
-                ReturnStmt = 188,
-                SEHExceptStmt = 189,
-                SEHFinallyStmt = 190,
-                SEHLeaveStmt = 191,
-                SEHTryStmt = 192,
-                CaseStmt = 193,
-                DefaultStmt = 194,
-                SwitchStmt = 195,
-                WhileStmt = 196
-            }
-
             public unsafe partial class Stmt : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+
+                    [FieldOffset(24)]
                     internal global::System.IntPtr stripLabelLikeStatements;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17489,8 +17362,8 @@ public partial struct __Internal
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="??0Stmt@AST@CppParser@CppSharp@@QEAA@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0Stmt@AST@CppParser@CppSharp@@QEAA@W4StmtClass@0123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -17498,6 +17371,136 @@ public partial struct __Internal
                     internal static extern global::System.IntPtr cctor(global::System.IntPtr __instance, global::System.IntPtr _0);
                 }
 
+                public enum StmtClass
+                {
+                    NoStmt = 0,
+                    GCCAsmStmt = 1,
+                    MSAsmStmt = 2,
+                    AttributedStmt = 3,
+                    BreakStmt = 4,
+                    CXXCatchStmt = 5,
+                    CXXForRangeStmt = 6,
+                    CXXTryStmt = 7,
+                    CapturedStmt = 8,
+                    CompoundStmt = 9,
+                    ContinueStmt = 10,
+                    CoreturnStmt = 11,
+                    CoroutineBodyStmt = 12,
+                    DeclStmt = 13,
+                    DoStmt = 14,
+                    BinaryConditionalOperator = 15,
+                    ConditionalOperator = 16,
+                    AddrLabelExpr = 17,
+                    ArrayInitIndexExpr = 18,
+                    ArrayInitLoopExpr = 19,
+                    ArraySubscriptExpr = 20,
+                    ArrayTypeTraitExpr = 21,
+                    AsTypeExpr = 22,
+                    AtomicExpr = 23,
+                    BinaryOperator = 24,
+                    CompoundAssignOperator = 25,
+                    BlockExpr = 26,
+                    CXXBindTemporaryExpr = 27,
+                    CXXBoolLiteralExpr = 28,
+                    CXXConstructExpr = 29,
+                    CXXTemporaryObjectExpr = 30,
+                    CXXDefaultArgExpr = 31,
+                    CXXDefaultInitExpr = 32,
+                    CXXDeleteExpr = 33,
+                    CXXDependentScopeMemberExpr = 34,
+                    CXXFoldExpr = 35,
+                    CXXInheritedCtorInitExpr = 36,
+                    CXXNewExpr = 37,
+                    CXXNoexceptExpr = 38,
+                    CXXNullPtrLiteralExpr = 39,
+                    CXXPseudoDestructorExpr = 40,
+                    CXXScalarValueInitExpr = 41,
+                    CXXStdInitializerListExpr = 42,
+                    CXXThisExpr = 43,
+                    CXXThrowExpr = 44,
+                    CXXTypeidExpr = 45,
+                    CXXUnresolvedConstructExpr = 46,
+                    CXXUuidofExpr = 47,
+                    CallExpr = 48,
+                    CUDAKernelCallExpr = 49,
+                    CXXMemberCallExpr = 50,
+                    CXXOperatorCallExpr = 51,
+                    UserDefinedLiteral = 52,
+                    CStyleCastExpr = 53,
+                    CXXFunctionalCastExpr = 54,
+                    CXXConstCastExpr = 55,
+                    CXXDynamicCastExpr = 56,
+                    CXXReinterpretCastExpr = 57,
+                    CXXStaticCastExpr = 58,
+                    ImplicitCastExpr = 60,
+                    CharacterLiteral = 61,
+                    ChooseExpr = 62,
+                    CompoundLiteralExpr = 63,
+                    ConvertVectorExpr = 64,
+                    CoawaitExpr = 65,
+                    CoyieldExpr = 66,
+                    DeclRefExpr = 67,
+                    DependentCoawaitExpr = 68,
+                    DependentScopeDeclRefExpr = 69,
+                    DesignatedInitExpr = 70,
+                    DesignatedInitUpdateExpr = 71,
+                    ExpressionTraitExpr = 72,
+                    ExtVectorElementExpr = 73,
+                    FixedPointLiteral = 74,
+                    FloatingLiteral = 75,
+                    ConstantExpr = 76,
+                    ExprWithCleanups = 77,
+                    FunctionParmPackExpr = 78,
+                    GNUNullExpr = 79,
+                    GenericSelectionExpr = 80,
+                    ImaginaryLiteral = 81,
+                    ImplicitValueInitExpr = 82,
+                    InitListExpr = 83,
+                    IntegerLiteral = 84,
+                    LambdaExpr = 85,
+                    MSPropertyRefExpr = 86,
+                    MSPropertySubscriptExpr = 87,
+                    MaterializeTemporaryExpr = 88,
+                    MemberExpr = 89,
+                    NoInitExpr = 90,
+                    OffsetOfExpr = 107,
+                    OpaqueValueExpr = 108,
+                    UnresolvedLookupExpr = 109,
+                    UnresolvedMemberExpr = 110,
+                    PackExpansionExpr = 111,
+                    ParenExpr = 112,
+                    ParenListExpr = 113,
+                    PredefinedExpr = 114,
+                    PseudoObjectExpr = 115,
+                    ShuffleVectorExpr = 116,
+                    SizeOfPackExpr = 117,
+                    StmtExpr = 118,
+                    StringLiteral = 119,
+                    SubstNonTypeTemplateParmExpr = 120,
+                    SubstNonTypeTemplateParmPackExpr = 121,
+                    TypeTraitExpr = 122,
+                    TypoExpr = 123,
+                    UnaryExprOrTypeTraitExpr = 124,
+                    UnaryOperator = 125,
+                    VAArgExpr = 126,
+                    ForStmt = 127,
+                    GotoStmt = 128,
+                    IfStmt = 129,
+                    IndirectGotoStmt = 130,
+                    LabelStmt = 131,
+                    MSDependentExistsStmt = 132,
+                    NullStmt = 133,
+                    ReturnStmt = 188,
+                    SEHExceptStmt = 189,
+                    SEHFinallyStmt = 190,
+                    SEHLeaveStmt = 191,
+                    SEHTryStmt = 192,
+                    CaseStmt = 193,
+                    DefaultStmt = 194,
+                    SwitchStmt = 195,
+                    WhileStmt = 196
+                }
+
                 public global::System.IntPtr __Instance { get; protected set; }
 
                 protected int __PointerAdjustment;
@@ -17545,7 +17548,7 @@ public Stmt()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public Stmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public Stmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.Stmt.__Internal));
                     __ownsNativeInstance = true;
@@ -17577,12 +17580,12 @@ public virtual void Dispose(bool disposing)
                     __Instance = IntPtr.Zero;
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.Stmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.Stmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.Stmt(klass);
                 }
 
-                public global::CppSharp.Parser.AST.StmtClass StmtClass
+                public global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass
                 {
                     get
                     {
@@ -17608,6 +17611,19 @@ public virtual void Dispose(bool disposing)
                     }
                 }
 
+                public global::CppSharp.Parser.SourceLocation BeginLoc
+                {
+                    get
+                    {
+                        return global::CppSharp.Parser.SourceLocation.__CreateInstance(((global::CppSharp.Parser.AST.Stmt.__Internal*) __Instance)->beginLoc);
+                    }
+
+                    set
+                    {
+                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->beginLoc = value.__Instance;
+                    }
+                }
+
                 public global::CppSharp.Parser.SourceLocation EndLoc
                 {
                     get
@@ -17642,28 +17658,31 @@ public virtual void Dispose(bool disposing)
 
             public unsafe partial class DeclStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ decls;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isSingleDecl;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr singleDecl;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17836,25 +17855,28 @@ public uint GetdeclsCount
 
             public unsafe partial class NullStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal semiLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal byte hasLeadingEmptyMacro;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -17948,40 +17970,43 @@ public bool HasLeadingEmptyMacro
 
             public unsafe partial class CompoundStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_S_allocator__S0_ body;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte body_empty;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal uint size;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr body_front;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr body_back;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBracLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18211,28 +18236,31 @@ public uint GetbodyCount
 
             public unsafe partial class SwitchCase : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18242,8 +18270,8 @@ public unsafe partial class SwitchCase : global::CppSharp.Parser.AST.Stmt, IDisp
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="??0SwitchCase@AST@CppParser@CppSharp@@QEAA@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0SwitchCase@AST@CppParser@CppSharp@@QEAA@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -18293,7 +18321,7 @@ public SwitchCase()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public SwitchCase(global::CppSharp.Parser.AST.StmtClass klass)
+                public SwitchCase(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.SwitchCase.__Internal));
@@ -18311,7 +18339,7 @@ public SwitchCase(global::CppSharp.Parser.AST.SwitchCase _0)
                     *((global::CppSharp.Parser.AST.SwitchCase.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.SwitchCase.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.SwitchCase(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.SwitchCase(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.SwitchCase(klass);
                 }
@@ -18363,43 +18391,46 @@ public SwitchCase(global::CppSharp.Parser.AST.SwitchCase _0)
 
             public unsafe partial class CaseStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal caseLoc;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal byte caseStmtIsGNURange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18542,31 +18573,34 @@ public bool CaseStmtIsGNURange
 
             public unsafe partial class DefaultStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal defaultLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18647,28 +18681,31 @@ public DefaultStmt(global::CppSharp.Parser.AST.DefaultStmt _0)
 
             public unsafe partial class LabelStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal identLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr subStmt;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal identLoc;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr subStmt;
+
+                    [FieldOffset(48)]
                     internal global::System.IntPtr name;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18780,25 +18817,28 @@ public string Name
 
             public unsafe partial class AttributedStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal attrLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal attrLoc;
+
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -18897,55 +18937,58 @@ public AttributedStmt(global::CppSharp.Parser.AST.AttributedStmt _0)
 
             public unsafe partial class IfStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr then;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr _else;
+                    internal global::System.IntPtr then;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr _else;
 
                     [FieldOffset(56)]
+                    internal global::System.IntPtr init;
+
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ifLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal elseLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal byte _constexpr;
 
-                    [FieldOffset(65)]
+                    [FieldOffset(73)]
                     internal byte hasInitStorage;
 
-                    [FieldOffset(66)]
+                    [FieldOffset(74)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(67)]
+                    [FieldOffset(75)]
                     internal byte hasElseStorage;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte isObjCAvailabilityCheck;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19194,43 +19237,46 @@ public bool IsObjCAvailabilityCheck
 
             public unsafe partial class SwitchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 80)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(48)]
+                    internal global::System.IntPtr init;
+
+                    [FieldOffset(56)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal switchLoc;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte hasInitStorage;
 
-                    [FieldOffset(53)]
+                    [FieldOffset(61)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal byte isAllEnumCasesCovered;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19422,34 +19468,37 @@ public bool IsAllEnumCasesCovered
 
             public unsafe partial class WhileStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr body;
+
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal byte hasVarStorage;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19597,34 +19646,37 @@ public bool HasVarStorage
 
             public unsafe partial class DoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr body;
+
+                    [FieldOffset(48)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal doLoc;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal whileLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -19767,43 +19819,46 @@ public DoStmt(global::CppSharp.Parser.AST.DoStmt _0)
 
             public unsafe partial class ForStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr inc;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr inc;
 
                     [FieldOffset(56)]
+                    internal global::System.IntPtr body;
+
+                    [FieldOffset(64)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
 
-                    [FieldOffset(60)]
+                    [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::System.IntPtr conditionVariableDeclStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20000,25 +20055,28 @@ public ForStmt(global::CppSharp.Parser.AST.ForStmt _0)
 
             public unsafe partial class GotoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal labelLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20112,28 +20170,31 @@ public GotoStmt(global::CppSharp.Parser.AST.GotoStmt _0)
 
             public unsafe partial class IndirectGotoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal gotoLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal starLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr target;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20245,22 +20306,25 @@ public IndirectGotoStmt(global::CppSharp.Parser.AST.IndirectGotoStmt _0)
 
             public unsafe partial class ContinueStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal continueLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20341,22 +20405,25 @@ public ContinueStmt(global::CppSharp.Parser.AST.ContinueStmt _0)
 
             public unsafe partial class BreakStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal breakLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20437,25 +20504,28 @@ public BreakStmt(global::CppSharp.Parser.AST.BreakStmt _0)
 
             public unsafe partial class ReturnStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr retValue;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::System.IntPtr retValue;
+
+                    [FieldOffset(40)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal returnLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20554,46 +20624,49 @@ public ReturnStmt(global::CppSharp.Parser.AST.ReturnStmt _0)
 
             public unsafe partial class AsmStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal byte simple;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(85)]
                     internal byte _volatile;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numOutputs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numInputs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numClobbers;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -20603,8 +20676,8 @@ public unsafe partial class AsmStmt : global::CppSharp.Parser.AST.Stmt, IDisposa
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="??0AsmStmt@AST@CppParser@CppSharp@@QEAA@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0AsmStmt@AST@CppParser@CppSharp@@QEAA@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -20699,7 +20772,7 @@ public AsmStmt()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public AsmStmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public AsmStmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.AsmStmt.__Internal));
@@ -20781,7 +20854,7 @@ public void Clearoutputs()
                     __Internal.Clearoutputs((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.AsmStmt(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.AsmStmt(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.AsmStmt(klass);
                 }
@@ -20898,49 +20971,52 @@ public uint GetoutputsCount
 
             public unsafe partial class GCCAsmStmt : global::CppSharp.Parser.AST.AsmStmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal byte simple;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(85)]
                     internal byte _volatile;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numOutputs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numInputs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numClobbers;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21229,58 +21305,61 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class MSAsmStmt : global::CppSharp.Parser.AST.AsmStmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 144)]
+                [StructLayout(LayoutKind.Explicit, Size = 152)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
 
-                    [FieldOffset(76)]
+                    [FieldOffset(84)]
                     internal byte simple;
 
-                    [FieldOffset(77)]
+                    [FieldOffset(85)]
                     internal byte _volatile;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numOutputs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numPlusOperands;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numInputs;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numClobbers;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBraceLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte hasBraces;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numAsmToks;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C asmString;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21424,28 +21503,31 @@ public string AsmString
 
             public unsafe partial class SEHExceptStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal exceptLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr filterExpr;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal exceptLoc;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr filterExpr;
+
+                    [FieldOffset(48)]
                     internal global::System.IntPtr block;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21562,25 +21644,28 @@ public SEHExceptStmt(global::CppSharp.Parser.AST.SEHExceptStmt _0)
 
             public unsafe partial class SEHFinallyStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal finallyLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal finallyLoc;
+
+                    [FieldOffset(40)]
                     internal global::System.IntPtr block;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21679,37 +21764,40 @@ public SEHFinallyStmt(global::CppSharp.Parser.AST.SEHFinallyStmt _0)
 
             public unsafe partial class SEHTryStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal byte isCXXTry;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr tryBlock;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr handler;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr exceptHandler;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr finallyHandler;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21875,22 +21963,25 @@ public bool IsCXXTry
 
             public unsafe partial class SEHLeaveStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal leaveLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -21971,28 +22062,31 @@ public SEHLeaveStmt(global::CppSharp.Parser.AST.SEHLeaveStmt _0)
 
             public unsafe partial class CapturedStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 72)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ capture_inits;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr capturedStmt;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal uint capture_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22357,28 +22451,31 @@ public uint GetcaptureInitsCount
 
             public unsafe partial class CXXCatchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 64)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal catchLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
+                    internal global::CppSharp.Parser.SourceLocation.__Internal catchLoc;
+
+                    [FieldOffset(40)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal caughtType;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal global::System.IntPtr handlerBlock;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22490,28 +22587,31 @@ public CXXCatchStmt(global::CppSharp.Parser.AST.CXXCatchStmt _0)
 
             public unsafe partial class CXXTryStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr tryBlock;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal tryLoc;
 
                     [FieldOffset(40)]
+                    internal global::System.IntPtr tryBlock;
+
+                    [FieldOffset(48)]
                     internal uint numHandlers;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22623,58 +22723,61 @@ public uint NumHandlers
 
             public unsafe partial class CXXForRangeStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::System.IntPtr init;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr rangeInit;
+                    internal global::System.IntPtr init;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr cond;
+                    internal global::System.IntPtr rangeInit;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr inc;
+                    internal global::System.IntPtr cond;
 
                     [FieldOffset(56)]
-                    internal global::System.IntPtr body;
+                    internal global::System.IntPtr inc;
 
                     [FieldOffset(64)]
-                    internal global::System.IntPtr rangeStmt;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(72)]
-                    internal global::System.IntPtr beginStmt;
+                    internal global::System.IntPtr rangeStmt;
 
                     [FieldOffset(80)]
-                    internal global::System.IntPtr endStmt;
+                    internal global::System.IntPtr beginStmt;
 
                     [FieldOffset(88)]
-                    internal global::System.IntPtr loopVarStmt;
+                    internal global::System.IntPtr endStmt;
 
                     [FieldOffset(96)]
+                    internal global::System.IntPtr loopVarStmt;
+
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal forLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal coawaitLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -22956,31 +23059,34 @@ public CXXForRangeStmt(global::CppSharp.Parser.AST.CXXForRangeStmt _0)
 
             public unsafe partial class MSDependentExistsStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(36)]
                     internal byte isIfExists;
 
-                    [FieldOffset(29)]
+                    [FieldOffset(37)]
                     internal byte isIfNotExists;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr subStmt;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23105,58 +23211,61 @@ public bool IsIfNotExists
 
             public unsafe partial class CoroutineBodyStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal byte hasDependentPromiseType;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
                     [FieldOffset(32)]
-                    internal global::System.IntPtr body;
+                    internal byte hasDependentPromiseType;
 
                     [FieldOffset(40)]
-                    internal global::System.IntPtr promiseDeclStmt;
+                    internal global::System.IntPtr body;
 
                     [FieldOffset(48)]
-                    internal global::System.IntPtr initSuspendStmt;
+                    internal global::System.IntPtr promiseDeclStmt;
 
                     [FieldOffset(56)]
-                    internal global::System.IntPtr finalSuspendStmt;
+                    internal global::System.IntPtr initSuspendStmt;
 
                     [FieldOffset(64)]
-                    internal global::System.IntPtr exceptionHandler;
+                    internal global::System.IntPtr finalSuspendStmt;
 
                     [FieldOffset(72)]
-                    internal global::System.IntPtr fallthroughHandler;
+                    internal global::System.IntPtr exceptionHandler;
 
                     [FieldOffset(80)]
-                    internal global::System.IntPtr allocate;
+                    internal global::System.IntPtr fallthroughHandler;
 
                     [FieldOffset(88)]
-                    internal global::System.IntPtr deallocate;
+                    internal global::System.IntPtr allocate;
 
                     [FieldOffset(96)]
-                    internal global::System.IntPtr returnValueInit;
+                    internal global::System.IntPtr deallocate;
 
                     [FieldOffset(104)]
-                    internal global::System.IntPtr resultDecl;
+                    internal global::System.IntPtr returnValueInit;
 
                     [FieldOffset(112)]
-                    internal global::System.IntPtr returnStmt;
+                    internal global::System.IntPtr resultDecl;
 
                     [FieldOffset(120)]
+                    internal global::System.IntPtr returnStmt;
+
+                    [FieldOffset(128)]
                     internal global::System.IntPtr returnStmtOnAllocFailure;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23558,31 +23667,34 @@ public bool HasDependentPromiseType
 
             public unsafe partial class CoreturnStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal byte isImplicit;
+                    internal global::System.IntPtr stripLabelLikeStatements;
 
-                    [FieldOffset(28)]
+                    [FieldOffset(32)]
+                    internal byte isImplicit;
+
+                    [FieldOffset(36)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(32)]
+                    [FieldOffset(40)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal global::System.IntPtr promiseCall;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23912,61 +24024,64 @@ public enum UnaryExprOrTypeTrait
 
             public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -23976,8 +24091,8 @@ public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="??0Expr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0Expr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -24338,7 +24453,7 @@ public Expr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public Expr(global::CppSharp.Parser.AST.StmtClass klass)
+                public Expr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.Expr.__Internal));
@@ -24356,7 +24471,7 @@ public Expr(global::CppSharp.Parser.AST.Expr _0)
                     *((global::CppSharp.Parser.AST.Expr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.Expr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.Expr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.Expr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.Expr(klass);
                 }
@@ -24556,64 +24671,67 @@ public bool HasPlaceholderType
 
             public unsafe partial class FullExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -24623,8 +24741,8 @@ public unsafe partial class FullExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="??0FullExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0FullExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -24674,7 +24792,7 @@ public FullExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public FullExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public FullExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.FullExpr.__Internal));
@@ -24692,7 +24810,7 @@ public FullExpr(global::CppSharp.Parser.AST.FullExpr _0)
                     *((global::CppSharp.Parser.AST.FullExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.FullExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.FullExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.FullExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.FullExpr(klass);
                 }
@@ -24718,64 +24836,67 @@ public FullExpr(global::CppSharp.Parser.AST.FullExpr _0)
 
             public unsafe partial class ConstantExpr : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -24843,70 +24964,73 @@ public ConstantExpr(global::CppSharp.Parser.AST.ConstantExpr _0)
 
             public unsafe partial class OpaqueValueExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte isUnique;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr sourceExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25018,97 +25142,100 @@ public bool IsUnique
 
             public unsafe partial class DeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(85)]
+                    [FieldOffset(93)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr foundDecl;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hasTemplateKWAndArgsInfo;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(113)]
+                    [FieldOffset(121)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte refersToEnclosingVariableOrCapture;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25337,67 +25464,70 @@ public bool RefersToEnclosingVariableOrCapture
 
             public unsafe partial class IntegerLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal ulong value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25491,67 +25621,70 @@ public ulong Value
 
             public unsafe partial class FixedPointLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal ulong value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25645,70 +25778,73 @@ public ulong Value
 
             public unsafe partial class CharacterLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.AST.CharacterLiteral.CharacterKind kind;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25824,70 +25960,73 @@ public uint Value
 
             public unsafe partial class FloatingLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte exact;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal double valueAsApproximateDouble;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -25994,64 +26133,67 @@ public double ValueAsApproximateDouble
 
             public unsafe partial class ImaginaryLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26137,106 +26279,109 @@ public ImaginaryLiteral(global::CppSharp.Parser.AST.ImaginaryLiteral _0)
 
             public unsafe partial class StringLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 184)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C bytes;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint byteLength;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal uint length;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal uint charByteWidth;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal global::CppSharp.Parser.AST.StringLiteral.StringKind kind;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal byte isAscii;
 
-                    [FieldOffset(161)]
+                    [FieldOffset(169)]
                     internal byte isWide;
 
-                    [FieldOffset(162)]
+                    [FieldOffset(170)]
                     internal byte isUTF8;
 
-                    [FieldOffset(163)]
+                    [FieldOffset(171)]
                     internal byte isUTF16;
 
-                    [FieldOffset(164)]
+                    [FieldOffset(172)]
                     internal byte isUTF32;
 
-                    [FieldOffset(165)]
+                    [FieldOffset(173)]
                     internal byte isPascal;
 
-                    [FieldOffset(166)]
+                    [FieldOffset(174)]
                     internal byte containsNonAscii;
 
-                    [FieldOffset(167)]
+                    [FieldOffset(175)]
                     internal byte containsNonAsciiOrNull;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal uint numConcatenated;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26535,67 +26680,70 @@ public uint NumConcatenated
 
             public unsafe partial class PredefinedExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.AST.PredefinedExpr.IdentKind identKind;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26701,70 +26849,73 @@ public PredefinedExpr(global::CppSharp.Parser.AST.PredefinedExpr _0)
 
             public unsafe partial class ParenExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParen;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParen;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -26876,91 +27027,94 @@ public ParenExpr(global::CppSharp.Parser.AST.ParenExpr _0)
 
             public unsafe partial class UnaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.UnaryOperatorKind opcode;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte canOverflow;
 
-                    [FieldOffset(101)]
+                    [FieldOffset(109)]
                     internal byte isPrefix;
 
-                    [FieldOffset(102)]
+                    [FieldOffset(110)]
                     internal byte isPostfix;
 
-                    [FieldOffset(103)]
+                    [FieldOffset(111)]
                     internal byte isIncrementOp;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal byte isDecrementOp;
 
-                    [FieldOffset(105)]
+                    [FieldOffset(113)]
                     internal byte isIncrementDecrementOp;
 
-                    [FieldOffset(106)]
+                    [FieldOffset(114)]
                     internal byte isArithmeticOp;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27163,73 +27317,76 @@ public bool IsArithmeticOp
 
             public unsafe partial class OffsetOfExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numComponents;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numExpressions;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27349,82 +27506,85 @@ public uint NumExpressions
 
             public unsafe partial class UnaryExprOrTypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.UnaryExprOrTypeTrait kind;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte isArgumentType;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal argumentType;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr argumentExpr;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeOfArgument;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27588,76 +27748,79 @@ public bool IsArgumentType
 
             public unsafe partial class ArraySubscriptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracketLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr idx;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27810,88 +27973,91 @@ public ArraySubscriptExpr(global::CppSharp.Parser.AST.ArraySubscriptExpr _0)
 
             public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -27901,8 +28067,8 @@ public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="??0CallExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0CallExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -27977,7 +28143,7 @@ public CallExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CallExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CallExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CallExpr.__Internal));
@@ -28035,7 +28201,7 @@ public void Cleararguments()
                     __Internal.Cleararguments((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CallExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CallExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CallExpr(klass);
                 }
@@ -28171,100 +28337,103 @@ public uint GetargumentsCount
 
             public unsafe partial class MemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte arrow;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(113)]
+                    [FieldOffset(121)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal byte isImplicitAccess;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28506,70 +28675,73 @@ public bool IsImplicitAccess
 
             public unsafe partial class CompoundLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr initializer;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte fileScope;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28681,82 +28853,85 @@ public bool FileScope
 
             public unsafe partial class CastExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte path_empty;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint path_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -28766,8 +28941,8 @@ public unsafe partial class CastExpr : global::CppSharp.Parser.AST.Expr, IDispos
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="??0CastExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0CastExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -28817,7 +28992,7 @@ public CastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CastExpr.__Internal));
@@ -28835,7 +29010,7 @@ public CastExpr(global::CppSharp.Parser.AST.CastExpr _0)
                     *((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CastExpr(klass);
                 }
@@ -28949,85 +29124,88 @@ public uint PathSize
 
             public unsafe partial class ImplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte path_empty;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint path_size;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isPartOfExplicitCast;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29113,85 +29291,88 @@ public bool IsPartOfExplicitCast
 
             public unsafe partial class ExplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 144)]
+                [StructLayout(LayoutKind.Explicit, Size = 152)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte path_empty;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint path_size;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29201,8 +29382,8 @@ public unsafe partial class ExplicitCastExpr : global::CppSharp.Parser.AST.CastE
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="??0ExplicitCastExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0ExplicitCastExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -29252,7 +29433,7 @@ public ExplicitCastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public ExplicitCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public ExplicitCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal));
@@ -29270,7 +29451,7 @@ public ExplicitCastExpr(global::CppSharp.Parser.AST.ExplicitCastExpr _0)
                     *((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.ExplicitCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.ExplicitCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.ExplicitCastExpr(klass);
                 }
@@ -29291,91 +29472,94 @@ public ExplicitCastExpr(global::CppSharp.Parser.AST.ExplicitCastExpr _0)
 
             public unsafe partial class CStyleCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte path_empty;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint path_size;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29469,118 +29653,121 @@ public CStyleCastExpr(global::CppSharp.Parser.AST.CStyleCastExpr _0)
 
             public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind opcode;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte isPtrMemOp;
 
-                    [FieldOffset(137)]
+                    [FieldOffset(145)]
                     internal byte isMultiplicativeOp;
 
-                    [FieldOffset(138)]
+                    [FieldOffset(146)]
                     internal byte isAdditiveOp;
 
-                    [FieldOffset(139)]
+                    [FieldOffset(147)]
                     internal byte isShiftOp;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal byte isBitwiseOp;
 
-                    [FieldOffset(141)]
+                    [FieldOffset(149)]
                     internal byte isRelationalOp;
 
-                    [FieldOffset(142)]
+                    [FieldOffset(150)]
                     internal byte isEqualityOp;
 
-                    [FieldOffset(143)]
+                    [FieldOffset(151)]
                     internal byte isComparisonOp;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal byte isLogicalOp;
 
-                    [FieldOffset(145)]
+                    [FieldOffset(153)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(146)]
+                    [FieldOffset(154)]
                     internal byte isCompoundAssignmentOp;
 
-                    [FieldOffset(147)]
+                    [FieldOffset(155)]
                     internal byte isShiftAssignOp;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isFPContractableWithinStatement;
 
-                    [FieldOffset(149)]
+                    [FieldOffset(157)]
                     internal byte isFEnvAccessOn;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -29590,8 +29777,8 @@ public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, I
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="??0BinaryOperator@AST@CppParser@CppSharp@@QEAA@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0BinaryOperator@AST@CppParser@CppSharp@@QEAA@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -29646,7 +29833,7 @@ public BinaryOperator()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public BinaryOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public BinaryOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.BinaryOperator.__Internal));
@@ -29680,7 +29867,7 @@ public override void Dispose(bool disposing)
                     __Instance = IntPtr.Zero;
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.BinaryOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.BinaryOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.BinaryOperator(klass);
                 }
@@ -29948,124 +30135,127 @@ public bool IsFEnvAccessOn
 
             public unsafe partial class CompoundAssignOperator : global::CppSharp.Parser.AST.BinaryOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 184)]
+                [StructLayout(LayoutKind.Explicit, Size = 192)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind opcode;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte isPtrMemOp;
 
-                    [FieldOffset(137)]
+                    [FieldOffset(145)]
                     internal byte isMultiplicativeOp;
 
-                    [FieldOffset(138)]
+                    [FieldOffset(146)]
                     internal byte isAdditiveOp;
 
-                    [FieldOffset(139)]
+                    [FieldOffset(147)]
                     internal byte isShiftOp;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal byte isBitwiseOp;
 
-                    [FieldOffset(141)]
+                    [FieldOffset(149)]
                     internal byte isRelationalOp;
 
-                    [FieldOffset(142)]
+                    [FieldOffset(150)]
                     internal byte isEqualityOp;
 
-                    [FieldOffset(143)]
+                    [FieldOffset(151)]
                     internal byte isComparisonOp;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal byte isLogicalOp;
 
-                    [FieldOffset(145)]
+                    [FieldOffset(153)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(146)]
+                    [FieldOffset(154)]
                     internal byte isCompoundAssignmentOp;
 
-                    [FieldOffset(147)]
+                    [FieldOffset(155)]
                     internal byte isShiftAssignOp;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isFPContractableWithinStatement;
 
-                    [FieldOffset(149)]
+                    [FieldOffset(157)]
                     internal byte isFEnvAccessOn;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal computationLHSType;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal computationResultType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30180,76 +30370,79 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class AbstractConditionalOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30259,8 +30452,8 @@ public unsafe partial class AbstractConditionalOperator : global::CppSharp.Parse
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="??0AbstractConditionalOperator@AST@CppParser@CppSharp@@QEAA@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0AbstractConditionalOperator@AST@CppParser@CppSharp@@QEAA@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -30310,7 +30503,7 @@ public AbstractConditionalOperator()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public AbstractConditionalOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public AbstractConditionalOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal));
@@ -30328,7 +30521,7 @@ public AbstractConditionalOperator(global::CppSharp.Parser.AST.AbstractCondition
                     *((global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.AbstractConditionalOperator.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.AbstractConditionalOperator(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.AbstractConditionalOperator(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.AbstractConditionalOperator(klass);
                 }
@@ -30416,82 +30609,85 @@ public AbstractConditionalOperator(global::CppSharp.Parser.AST.AbstractCondition
 
             public unsafe partial class ConditionalOperator : global::CppSharp.Parser.AST.AbstractConditionalOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr rHS;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30595,82 +30791,85 @@ public ConditionalOperator(global::CppSharp.Parser.AST.ConditionalOperator _0)
 
             public unsafe partial class BinaryConditionalOperator : global::CppSharp.Parser.AST.AbstractConditionalOperator, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr trueExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr falseExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal questionLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr common;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr opaqueValue;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30774,67 +30973,70 @@ public BinaryConditionalOperator(global::CppSharp.Parser.AST.BinaryConditionalOp
 
             public unsafe partial class AddrLabelExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ampAmpLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal labelLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -30928,70 +31130,73 @@ public AddrLabelExpr(global::CppSharp.Parser.AST.AddrLabelExpr _0)
 
             public unsafe partial class StmtExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subStmt;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31103,70 +31308,73 @@ public StmtExpr(global::CppSharp.Parser.AST.StmtExpr _0)
 
             public unsafe partial class ShuffleVectorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numSubExprs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31273,70 +31481,73 @@ public uint NumSubExprs
 
             public unsafe partial class ConvertVectorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr srcExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31448,85 +31659,88 @@ public ConvertVectorExpr(global::CppSharp.Parser.AST.ConvertVectorExpr _0)
 
             public unsafe partial class ChooseExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte isConditionTrue;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr cond;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte isConditionDependent;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr chosenSubExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31718,64 +31932,67 @@ public bool IsConditionDependent
 
             public unsafe partial class GNUNullExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tokenLocation;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -31856,73 +32073,76 @@ public GNUNullExpr(global::CppSharp.Parser.AST.GNUNullExpr _0)
 
             public unsafe partial class VAArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte isMicrosoftABI;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -32047,97 +32267,100 @@ public bool IsMicrosoftABI
 
             public unsafe partial class InitListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr arrayFiller;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lBraceLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBraceLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr syntacticForm;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numInits;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal byte hasArrayFiller;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(117)]
                     internal byte isExplicit;
 
-                    [FieldOffset(110)]
+                    [FieldOffset(118)]
                     internal byte isStringLiteralInit;
 
-                    [FieldOffset(111)]
+                    [FieldOffset(119)]
                     internal byte isTransparent;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte isSemanticForm;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr semanticForm;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isSyntacticForm;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -32376,79 +32599,82 @@ public bool IsSyntacticForm
 
             public unsafe partial class DesignatedInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal equalOrColonLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr init;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal uint size;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte usesGNUSyntax;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numSubExprs;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceRange.__Internal designatorsSourceRange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33044,61 +33270,64 @@ public uint NumSubExprs
 
             public unsafe partial class NoInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33166,67 +33395,70 @@ public NoInitExpr(global::CppSharp.Parser.AST.NoInitExpr _0)
 
             public unsafe partial class DesignatedInitUpdateExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr updater;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33330,67 +33562,70 @@ public DesignatedInitUpdateExpr(global::CppSharp.Parser.AST.DesignatedInitUpdate
 
             public unsafe partial class ArrayInitLoopExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33494,61 +33729,64 @@ public ArrayInitLoopExpr(global::CppSharp.Parser.AST.ArrayInitLoopExpr _0)
 
             public unsafe partial class ArrayInitIndexExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33616,61 +33854,64 @@ public ArrayInitIndexExpr(global::CppSharp.Parser.AST.ArrayInitIndexExpr _0)
 
             public unsafe partial class ImplicitValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33738,70 +33979,73 @@ public ImplicitValueInitExpr(global::CppSharp.Parser.AST.ImplicitValueInitExpr _
 
             public unsafe partial class ParenListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numExprs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -33908,85 +34152,88 @@ public uint NumExprs
 
             public unsafe partial class GenericSelectionExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numAssocs;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal genericLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal defaultLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr controllingExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal byte isResultDependent;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal uint resultIndex;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr resultExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34168,76 +34415,79 @@ public uint ResultIndex
 
             public unsafe partial class ExtVectorElementExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal accessorLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal uint numElements;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte containsDuplicateElements;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte isArrow;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34375,67 +34625,70 @@ public bool IsArrow
 
             public unsafe partial class BlockExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal caretLocation;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr body;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34534,70 +34787,73 @@ public BlockExpr(global::CppSharp.Parser.AST.BlockExpr _0)
 
             public unsafe partial class AsTypeExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr srcExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34709,73 +34965,76 @@ public AsTypeExpr(global::CppSharp.Parser.AST.AsTypeExpr _0)
 
             public unsafe partial class PseudoObjectExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr syntacticForm;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint resultExprIndex;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr resultExpr;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numSemanticExprs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -34905,106 +35164,109 @@ public uint NumSemanticExprs
 
             public unsafe partial class AtomicExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 184)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr ptr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr order;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr scope;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr val1;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr orderFail;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr val2;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr weak;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal valueType;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.AtomicExpr.AtomicOp op;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal uint numSubExprs;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal byte isVolatile;
 
-                    [FieldOffset(161)]
+                    [FieldOffset(169)]
                     internal byte isCmpXChg;
 
-                    [FieldOffset(162)]
+                    [FieldOffset(170)]
                     internal byte isOpenCL;
 
-                    [FieldOffset(164)]
+                    [FieldOffset(172)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal builtinLoc;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35352,61 +35614,64 @@ public bool IsOpenCL
 
             public unsafe partial class TypoExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 88)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35474,103 +35739,106 @@ public TypoExpr(global::CppSharp.Parser.AST.TypoExpr _0)
 
             public unsafe partial class CXXOperatorCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.OverloadedOperatorKind _operator;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal byte isAssignmentOp;
 
-                    [FieldOffset(157)]
+                    [FieldOffset(165)]
                     internal byte isInfixBinaryOp;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(164)]
+                    [FieldOffset(172)]
                     internal byte isFPContractableWithinStatement;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35724,94 +35992,97 @@ public bool IsFPContractableWithinStatement
 
             public unsafe partial class CXXMemberCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::System.IntPtr implicitObjectArgument;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::System.IntPtr methodDecl;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -35936,91 +36207,94 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CUDAKernelCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::System.IntPtr config;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36127,97 +36401,100 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CXXNamedCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte path_empty;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint path_size;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36227,8 +36504,8 @@ public unsafe partial class CXXNamedCastExpr : global::CppSharp.Parser.AST.Expli
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="??0CXXNamedCastExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0CXXNamedCastExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -36278,7 +36555,7 @@ public CXXNamedCastExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CXXNamedCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CXXNamedCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal));
@@ -36296,7 +36573,7 @@ public CXXNamedCastExpr(global::CppSharp.Parser.AST.CXXNamedCastExpr _0)
                     *((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CXXNamedCastExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CXXNamedCastExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CXXNamedCastExpr(klass);
                 }
@@ -36356,97 +36633,100 @@ public string CastName
 
             public unsafe partial class CXXStaticCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte path_empty;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint path_size;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36514,100 +36794,103 @@ public CXXStaticCastExpr(global::CppSharp.Parser.AST.CXXStaticCastExpr _0)
 
             public unsafe partial class CXXDynamicCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 184)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte path_empty;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint path_size;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal byte isAlwaysNull;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36688,97 +36971,100 @@ public bool IsAlwaysNull
 
             public unsafe partial class CXXReinterpretCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte path_empty;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint path_size;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -36846,97 +37132,100 @@ public CXXReinterpretCastExpr(global::CppSharp.Parser.AST.CXXReinterpretCastExpr
 
             public unsafe partial class CXXConstCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte path_empty;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint path_size;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::System.IntPtr castName;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::CppSharp.Parser.SourceRange.__Internal angleBrackets;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37004,97 +37293,100 @@ public CXXConstCastExpr(global::CppSharp.Parser.AST.CXXConstCastExpr _0)
 
             public unsafe partial class UserDefinedLiteral : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 184)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr callee;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr calleeDecl;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr directCallee;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal uint numArgs;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal uint numCommas;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal uint builtinCallee;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal byte isCallToStdMove;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.UserDefinedLiteral.LiteralOperatorKind literalOperatorKind;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::System.IntPtr cookedLiteral;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal uDSuffixLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37237,67 +37529,70 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class CXXBoolLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte value;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37391,64 +37686,67 @@ public bool Value
 
             public unsafe partial class CXXNullPtrLiteralExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37529,64 +37827,67 @@ public CXXNullPtrLiteralExpr(global::CppSharp.Parser.AST.CXXNullPtrLiteralExpr _
 
             public unsafe partial class CXXStdInitializerListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
-                    internal global::System.IntPtr sourceBitField;
-
                     [FieldOffset(64)]
-                    internal global::System.IntPtr referencedDeclOfCallee;
+                    internal global::System.IntPtr sourceBitField;
 
                     [FieldOffset(72)]
-                    internal byte hasPlaceholderType;
+                    internal global::System.IntPtr referencedDeclOfCallee;
 
                     [FieldOffset(80)]
+                    internal byte hasPlaceholderType;
+
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37672,70 +37973,73 @@ public CXXStdInitializerListExpr(global::CppSharp.Parser.AST.CXXStdInitializerLi
 
             public unsafe partial class CXXTypeidExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr exprOperand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte isPotentiallyEvaluated;
 
-                    [FieldOffset(89)]
+                    [FieldOffset(97)]
                     internal byte isTypeOperand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -37847,73 +38151,76 @@ public bool IsTypeOperand
 
             public unsafe partial class MSPropertyRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr baseExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte isArrow;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38038,70 +38345,73 @@ public bool IsArrow
 
             public unsafe partial class MSPropertySubscriptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rBracketLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr idx;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38218,70 +38528,73 @@ public MSPropertySubscriptExpr(global::CppSharp.Parser.AST.MSPropertySubscriptEx
 
             public unsafe partial class CXXUuidofExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr exprOperand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C uuidStr;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte isTypeOperand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38417,67 +38730,70 @@ public bool IsTypeOperand
 
             public unsafe partial class CXXThisExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal byte @implicit;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38571,70 +38887,73 @@ public bool Implicit
 
             public unsafe partial class CXXThrowExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal throwLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte isThrownVariableInScope;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38746,67 +39065,70 @@ public bool IsThrownVariableInScope
 
             public unsafe partial class CXXDefaultArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr expr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal usedLocation;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -38905,67 +39227,70 @@ public CXXDefaultArgExpr(global::CppSharp.Parser.AST.CXXDefaultArgExpr _0)
 
             public unsafe partial class CXXDefaultInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr field;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr expr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39069,64 +39394,67 @@ public CXXDefaultInitExpr(global::CppSharp.Parser.AST.CXXDefaultInitExpr _0)
 
             public unsafe partial class CXXBindTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39212,88 +39540,91 @@ public CXXBindTemporaryExpr(global::CppSharp.Parser.AST.CXXBindTemporaryExpr _0)
 
             public unsafe partial class CXXConstructExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal byte elidable;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(117)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(110)]
+                    [FieldOffset(118)]
                     internal byte listInitialization;
 
-                    [FieldOffset(111)]
+                    [FieldOffset(119)]
                     internal byte stdInitListInitialization;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte requiresZeroInitialization;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal global::CppSharp.Parser.SourceRange.__Internal parenOrBraceRange;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39303,8 +39634,8 @@ public unsafe partial class CXXConstructExpr : global::CppSharp.Parser.AST.Expr,
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="??0CXXConstructExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0CXXConstructExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -39387,7 +39718,7 @@ public CXXConstructExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CXXConstructExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CXXConstructExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CXXConstructExpr.__Internal));
@@ -39445,7 +39776,7 @@ public void Cleararguments()
                     __Internal.Cleararguments((__Instance + __PointerAdjustment));
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CXXConstructExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CXXConstructExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CXXConstructExpr(klass);
                 }
@@ -39566,70 +39897,73 @@ public uint GetargumentsCount
 
             public unsafe partial class CXXInheritedCtorInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte constructsVBase;
 
-                    [FieldOffset(81)]
+                    [FieldOffset(89)]
                     internal byte inheritedFromVBase;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39736,94 +40070,97 @@ public bool InheritedFromVBase
 
             public unsafe partial class CXXFunctionalCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.CastKind castKind;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr castKindName;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr subExprAsWritten;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr conversionFunction;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal byte path_empty;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint path_size;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal byte isListInitialization;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -39930,88 +40267,91 @@ public bool IsListInitialization
 
             public unsafe partial class CXXTemporaryObjectExpr : global::CppSharp.Parser.AST.CXXConstructExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal byte elidable;
 
-                    [FieldOffset(109)]
+                    [FieldOffset(117)]
                     internal byte hadMultipleCandidates;
 
-                    [FieldOffset(110)]
+                    [FieldOffset(118)]
                     internal byte listInitialization;
 
-                    [FieldOffset(111)]
+                    [FieldOffset(119)]
                     internal byte stdInitListInitialization;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte requiresZeroInitialization;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal global::CppSharp.Parser.SourceRange.__Internal parenOrBraceRange;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40100,91 +40440,94 @@ public override void Dispose(bool disposing)
 
             public unsafe partial class LambdaExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ capture_inits;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal captureDefaultLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal uint capture_size;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.SourceRange.__Internal introducerRange;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr callOperator;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isGenericLambda;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr body;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal byte isMutable;
 
-                    [FieldOffset(145)]
+                    [FieldOffset(153)]
                     internal byte hasExplicitParameters;
 
-                    [FieldOffset(146)]
+                    [FieldOffset(154)]
                     internal byte hasExplicitResultType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40453,64 +40796,67 @@ public uint GetcaptureInitsCount
 
             public unsafe partial class CXXScalarValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -40591,106 +40937,109 @@ public CXXScalarValueInitExpr(global::CppSharp.Parser.AST.CXXScalarValueInitExpr
 
             public unsafe partial class CXXNewExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 200)]
+                [StructLayout(LayoutKind.Explicit, Size = 208)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ placement_arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr operatorNew;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr operatorDelete;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal allocatedType;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal byte isArray;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal global::System.IntPtr arraySize;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal uint numPlacementArgs;
 
-                    [FieldOffset(156)]
+                    [FieldOffset(164)]
                     internal byte isParenTypeId;
 
-                    [FieldOffset(160)]
+                    [FieldOffset(168)]
                     internal global::CppSharp.Parser.SourceRange.__Internal typeIdParens;
 
-                    [FieldOffset(168)]
+                    [FieldOffset(176)]
                     internal byte isGlobalNew;
 
-                    [FieldOffset(169)]
+                    [FieldOffset(177)]
                     internal byte hasInitializer;
 
-                    [FieldOffset(172)]
+                    [FieldOffset(180)]
                     internal global::CppSharp.Parser.AST.CXXNewExpr.InitializationStyle initializationStyle;
 
-                    [FieldOffset(176)]
+                    [FieldOffset(184)]
                     internal global::System.IntPtr initializer;
 
-                    [FieldOffset(184)]
+                    [FieldOffset(192)]
                     internal global::System.IntPtr constructExpr;
 
-                    [FieldOffset(192)]
+                    [FieldOffset(200)]
                     internal global::CppSharp.Parser.SourceRange.__Internal directInitRange;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41046,79 +41395,82 @@ public uint GetplacementArgumentsCount
 
             public unsafe partial class CXXDeleteExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte isGlobalDelete;
 
-                    [FieldOffset(81)]
+                    [FieldOffset(89)]
                     internal byte isArrayForm;
 
-                    [FieldOffset(82)]
+                    [FieldOffset(90)]
                     internal byte isArrayFormAsWritten;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr operatorDelete;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr argument;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal destroyedType;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41274,85 +41626,88 @@ public bool IsArrayFormAsWritten
 
             public unsafe partial class CXXPseudoDestructorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte hasQualifier;
 
-                    [FieldOffset(89)]
+                    [FieldOffset(97)]
                     internal byte isArrow;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal colonColonLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal tildeLoc;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal destroyedType;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal destroyedTypeLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41529,67 +41884,70 @@ public bool IsArrow
 
             public unsafe partial class TypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte value;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41683,70 +42041,73 @@ public uint NumArgs
 
             public unsafe partial class ArrayTypeTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal queriedType;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal ulong value;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr dimensionExpression;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -41858,67 +42219,70 @@ public ulong Value
 
             public unsafe partial class ExpressionTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr queriedExpression;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42017,85 +42381,88 @@ public bool Value
 
             public unsafe partial class OverloadExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numDecls;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(101)]
+                    [FieldOffset(109)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42105,8 +42472,8 @@ public unsafe partial class OverloadExpr : global::CppSharp.Parser.AST.Expr, IDi
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="??0OverloadExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0OverloadExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -42244,7 +42611,7 @@ public OverloadExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public OverloadExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public OverloadExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.OverloadExpr.__Internal));
@@ -42262,7 +42629,7 @@ public OverloadExpr(global::CppSharp.Parser.AST.OverloadExpr _0)
                     *((global::CppSharp.Parser.AST.OverloadExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.OverloadExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.OverloadExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.OverloadExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.OverloadExpr(klass);
                 }
@@ -42374,91 +42741,94 @@ public uint NumTemplateArgs
 
             public unsafe partial class UnresolvedLookupExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 128)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numDecls;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(101)]
+                    [FieldOffset(109)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte requiresADL;
 
-                    [FieldOffset(113)]
+                    [FieldOffset(121)]
                     internal byte isOverloaded;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42552,82 +42922,85 @@ public bool IsOverloaded
 
             public unsafe partial class DependentScopeDeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42786,70 +43159,73 @@ public uint NumTemplateArgs
 
             public unsafe partial class ExprWithCleanups : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr subExpr;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal uint numObjects;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal byte cleanupsHaveSideEffects;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -42943,79 +43319,82 @@ public bool CleanupsHaveSideEffects
 
             public unsafe partial class CXXUnresolvedConstructExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal typeAsWritten;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isListInitialization;
 
-                    [FieldOffset(132)]
+                    [FieldOffset(140)]
                     internal uint arg_size;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43222,100 +43601,103 @@ public uint GetargumentsCount
 
             public unsafe partial class CXXDependentScopeMemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 160)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal baseType;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte isArrow;
 
-                    [FieldOffset(116)]
+                    [FieldOffset(124)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr firstQualifierFoundInScope;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
-                    [FieldOffset(132)]
+                    [FieldOffset(140)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(140)]
+                    [FieldOffset(148)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(145)]
+                    [FieldOffset(153)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal uint numTemplateArgs;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43562,106 +43944,109 @@ public uint NumTemplateArgs
 
             public unsafe partial class UnresolvedMemberExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 168)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal uint numDecls;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal templateKeywordLoc;
 
-                    [FieldOffset(92)]
+                    [FieldOffset(100)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lAngleLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rAngleLoc;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte hasTemplateKeyword;
 
-                    [FieldOffset(101)]
+                    [FieldOffset(109)]
                     internal byte hasExplicitTemplateArgs;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint numTemplateArgs;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal byte isImplicitAccess;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr @base;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal baseType;
 
-                    [FieldOffset(144)]
+                    [FieldOffset(152)]
                     internal byte hasUnresolvedUsing;
 
-                    [FieldOffset(145)]
+                    [FieldOffset(153)]
                     internal byte isArrow;
 
-                    [FieldOffset(148)]
+                    [FieldOffset(156)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(152)]
+                    [FieldOffset(160)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal memberLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43825,67 +44210,70 @@ public bool IsArrow
 
             public unsafe partial class CXXNoexceptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal byte value;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -43984,67 +44372,70 @@ public bool Value
 
             public unsafe partial class PackExpansionExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr pattern;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44143,79 +44534,82 @@ public PackExpansionExpr(global::CppSharp.Parser.AST.PackExpansionExpr _0)
 
             public unsafe partial class SizeOfPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal operatorLoc;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal packLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal rParenLoc;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr pack;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal uint packLength;
 
-                    [FieldOffset(108)]
+                    [FieldOffset(116)]
                     internal byte isPartiallySubstituted;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44366,67 +44760,70 @@ public bool IsPartiallySubstituted
 
             public unsafe partial class SubstNonTypeTemplateParmExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal nameLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr replacement;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44525,67 +44922,70 @@ public SubstNonTypeTemplateParmExpr(global::CppSharp.Parser.AST.SubstNonTypeTemp
 
             public unsafe partial class SubstNonTypeTemplateParmPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal parameterPackLocation;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::CppSharp.Parser.AST.TemplateArgument.__Internal argumentPack;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44679,67 +45079,70 @@ public SubstNonTypeTemplateParmPackExpr(global::CppSharp.Parser.AST.SubstNonType
 
             public unsafe partial class FunctionParmPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal parameterPackLocation;
 
-                    [FieldOffset(84)]
+                    [FieldOffset(92)]
                     internal uint numExpansions;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -44833,73 +45236,76 @@ public uint NumExpansions
 
             public unsafe partial class MaterializeTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr temporary;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr TemporaryExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal uint manglingNumber;
 
-                    [FieldOffset(100)]
+                    [FieldOffset(108)]
                     internal byte isBoundToLvalueReference;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45117,85 +45523,88 @@ public bool IsBoundToLvalueReference
 
             public unsafe partial class CXXFoldExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr lHS;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr rHS;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal byte isRightFold;
 
-                    [FieldOffset(97)]
+                    [FieldOffset(105)]
                     internal byte isLeftFold;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr pattern;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr init;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal ellipsisLoc;
 
-                    [FieldOffset(124)]
+                    [FieldOffset(132)]
                     internal global::CppSharp.Parser.AST.BinaryOperatorKind _operator;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45387,79 +45796,82 @@ public bool IsLeftFold
 
             public unsafe partial class CoroutineSuspendExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 136)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr resumeExpr;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45469,8 +45881,8 @@ public unsafe partial class CoroutineSuspendExpr : global::CppSharp.Parser.AST.E
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                        EntryPoint="??0CoroutineSuspendExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@123@@Z")]
-                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.StmtClass klass);
+                        EntryPoint="??0CoroutineSuspendExpr@AST@CppParser@CppSharp@@QEAA@W4StmtClass@Stmt@123@@Z")]
+                    internal static extern global::System.IntPtr ctor(global::System.IntPtr __instance, global::CppSharp.Parser.AST.Stmt.StmtClass klass);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -45529,7 +45941,7 @@ public CoroutineSuspendExpr()
                     __Internal.ctor((__Instance + __PointerAdjustment));
                 }
 
-                public CoroutineSuspendExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public CoroutineSuspendExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                     : this((void*) null)
                 {
                     __Instance = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal));
@@ -45547,7 +45959,7 @@ public CoroutineSuspendExpr(global::CppSharp.Parser.AST.CoroutineSuspendExpr _0)
                     *((global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal*) __Instance) = *((global::CppSharp.Parser.AST.CoroutineSuspendExpr.__Internal*) _0.__Instance);
                 }
 
-                public static implicit operator global::CppSharp.Parser.AST.CoroutineSuspendExpr(global::CppSharp.Parser.AST.StmtClass klass)
+                public static implicit operator global::CppSharp.Parser.AST.CoroutineSuspendExpr(global::CppSharp.Parser.AST.Stmt.StmtClass klass)
                 {
                     return new global::CppSharp.Parser.AST.CoroutineSuspendExpr(klass);
                 }
@@ -45658,85 +46070,88 @@ public CoroutineSuspendExpr(global::CppSharp.Parser.AST.CoroutineSuspendExpr _0)
 
             public unsafe partial class CoawaitExpr : global::CppSharp.Parser.AST.CoroutineSuspendExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 144)]
+                [StructLayout(LayoutKind.Explicit, Size = 152)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr resumeExpr;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal byte isImplicit;
 
-                    [FieldOffset(136)]
+                    [FieldOffset(144)]
                     internal global::System.IntPtr operand;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -45835,70 +46250,73 @@ public bool IsImplicit
 
             public unsafe partial class DependentCoawaitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::System.IntPtr operand;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr operatorCoawaitLookup;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -46015,82 +46433,85 @@ public DependentCoawaitExpr(global::CppSharp.Parser.AST.DependentCoawaitExpr _0)
 
             public unsafe partial class CoyieldExpr : global::CppSharp.Parser.AST.CoroutineSuspendExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 144)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::CppSharp.Parser.AST.StmtClass stmtClass;
+                    internal global::CppSharp.Parser.AST.Stmt.StmtClass stmtClass;
 
                     [FieldOffset(4)]
                     internal global::CppSharp.Parser.SourceRange.__Internal sourceRange;
 
                     [FieldOffset(12)]
-                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal beginLoc;
 
                     [FieldOffset(16)]
-                    internal global::System.IntPtr stripLabelLikeStatements;
+                    internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
+                    internal global::System.IntPtr stripLabelLikeStatements;
+
+                    [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal type;
 
-                    [FieldOffset(40)]
+                    [FieldOffset(48)]
                     internal byte valueDependent;
 
-                    [FieldOffset(41)]
+                    [FieldOffset(49)]
                     internal byte typeDependent;
 
-                    [FieldOffset(42)]
+                    [FieldOffset(50)]
                     internal byte instantiationDependent;
 
-                    [FieldOffset(43)]
+                    [FieldOffset(51)]
                     internal byte containsUnexpandedParameterPack;
 
-                    [FieldOffset(44)]
+                    [FieldOffset(52)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal exprLoc;
 
-                    [FieldOffset(48)]
+                    [FieldOffset(56)]
                     internal byte isLValue;
 
-                    [FieldOffset(49)]
+                    [FieldOffset(57)]
                     internal byte isRValue;
 
-                    [FieldOffset(50)]
+                    [FieldOffset(58)]
                     internal byte isXValue;
 
-                    [FieldOffset(51)]
+                    [FieldOffset(59)]
                     internal byte isGLValue;
 
-                    [FieldOffset(52)]
+                    [FieldOffset(60)]
                     internal byte isOrdinaryOrBitFieldObject;
 
-                    [FieldOffset(56)]
+                    [FieldOffset(64)]
                     internal global::System.IntPtr sourceBitField;
 
-                    [FieldOffset(64)]
+                    [FieldOffset(72)]
                     internal global::System.IntPtr referencedDeclOfCallee;
 
-                    [FieldOffset(72)]
+                    [FieldOffset(80)]
                     internal byte hasPlaceholderType;
 
-                    [FieldOffset(80)]
+                    [FieldOffset(88)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal keywordLoc;
 
-                    [FieldOffset(88)]
+                    [FieldOffset(96)]
                     internal global::System.IntPtr commonExpr;
 
-                    [FieldOffset(96)]
+                    [FieldOffset(104)]
                     internal global::System.IntPtr opaqueValue;
 
-                    [FieldOffset(104)]
+                    [FieldOffset(112)]
                     internal global::System.IntPtr readyExpr;
 
-                    [FieldOffset(112)]
+                    [FieldOffset(120)]
                     internal global::System.IntPtr suspendExpr;
 
-                    [FieldOffset(120)]
+                    [FieldOffset(128)]
                     internal global::System.IntPtr resumeExpr;
 
-                    [FieldOffset(128)]
+                    [FieldOffset(136)]
                     internal global::System.IntPtr operand;
 
                     [SuppressUnmanagedCodeSecurity]
diff --git a/src/CppParser/Bootstrap/Bootstrap.cs b/src/CppParser/Bootstrap/Bootstrap.cs
index b8d320d6ea..1055c5ada2 100644
--- a/src/CppParser/Bootstrap/Bootstrap.cs
+++ b/src/CppParser/Bootstrap/Bootstrap.cs
@@ -155,15 +155,13 @@ private void GenerateStmt(BindingContext ctx)
             var stmtClass = stmtUnit.FindNamespace("clang").FindClass("Stmt");
 
             var stmtClassEnum = stmtClass.FindEnum("StmtClass");
-            stmtClass.Declarations.Remove(stmtClassEnum);
             CleanupEnumItems(stmtClassEnum);
 
             var stmtSubclassVisitor = new SubclassVisitor(stmtClass);
             stmtUnit.Visit(stmtSubclassVisitor);
             stmtCxxUnit.Visit(stmtSubclassVisitor);
 
-            var decls = new Declaration[] { stmtClassEnum }
-                .Union(stmtSubclassVisitor.Classes);
+            var decls = stmtSubclassVisitor.Classes;
 
             // Write the native declarations headers
             var declsCodeGen = new StmtDeclarationsCodeGenerator(ctx, decls);
@@ -628,7 +626,7 @@ private void GenerateVisitor()
             WriteLineIndent("return default(TRet);");
             NewLine();
 
-            WriteLine($"switch({ParamName}.StmtClass)");
+            WriteLine($"switch({ParamName}.stmtClass)");
             WriteOpenBraceAndIndent();
 
             var enumItems = StmtClassEnum != null ?
@@ -648,7 +646,7 @@ public virtual void GenerateSwitchCases(IEnumerable<string> classes)
         {
             foreach (var className in classes)
             {
-                WriteLine($"case StmtClass.{className}:");
+                WriteLine($"case Stmt.StmtClass.{className}:");
                 WriteOpenBraceAndIndent();
 
                 WriteLine($"var _{ParamName} = {className}.__CreateInstance({ParamName}.__Instance);");
@@ -664,9 +662,9 @@ public virtual void GenerateSwitchCases(IEnumerable<string> classes)
                 UnindentAndWriteCloseBrace();
             }
             
-            WriteLine($"default:");
-            WriteLineIndent($"throw new System.NotImplementedException(" +
-                $"{ParamName}.StmtClass.ToString());");
+            WriteLine("default:");
+            WriteLineIndent("throw new System.NotImplementedException(" +
+                $"{ParamName}.stmtClass.ToString());");
         }
 
         private void GenerateConverter()
@@ -872,9 +870,6 @@ public override bool GenerateClassBody(Class @class)
             if (IsInheritedClass(@class))
                 WriteLine($"{@class.Name}(StmtClass klass);");
 
-            if (@class.Name == "Stmt")
-                WriteLine("StmtClass stmtClass;");
-
             foreach (var method in @class.Methods)
             {
                 if (SkipMethod(method))
@@ -989,7 +984,7 @@ private void GenerateMemberInits(Class @class)
         {
             foreach (var property in @class.Properties)
             {
-                if (SkipProperty(property))
+                if (SkipProperty(property) || property.Name == "stmtClass")
                     continue;
 
                 var typeName = GetDeclTypeName(property);
@@ -1383,16 +1378,12 @@ public static bool SkipProperty(Property property, bool skipBaseCheck = false)
                     return true;
             }
 
-            if (property.Name == "beginLoc" || property.Name == "endLoc" &&
+            if ((property.Name == "beginLoc" || property.Name == "endLoc") &&
                 @class.Name != "Stmt")
                 return true;
 
-            switch (property.Name)
-            {
-                case "stmtClass":
-                case "stmtClassName":
-                    return true;
-            }
+            if (property.Name == "stmtClassName")
+                return true;
 
             var typeName = property.Type.Visit(CppTypePrinter).Type;
 
@@ -1653,6 +1644,7 @@ public static string GetDeclName(Declaration decl,
                     case "literalOperatorKind":
                     case "initializationStyle":
                     case "capturedStmt":
+                    case "stmtClass":
                         hasConflict = true;
                         break;
                 }
diff --git a/src/CppParser/ParseExpr.cpp b/src/CppParser/ParseExpr.cpp
index beeca739d9..e0bb9785d9 100644
--- a/src/CppParser/ParseExpr.cpp
+++ b/src/CppParser/ParseExpr.cpp
@@ -26,6 +26,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ConstantExpr*>(llvm::cast<clang::ConstantExpr>(Expr));
         auto _S = new AST::ConstantExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -48,6 +49,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::OpaqueValueExpr*>(llvm::cast<clang::OpaqueValueExpr>(Expr));
         auto _S = new AST::OpaqueValueExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -71,6 +73,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::DeclRefExpr*>(llvm::cast<clang::DeclRefExpr>(Expr));
         auto _S = new AST::DeclRefExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -100,6 +103,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::IntegerLiteral*>(llvm::cast<clang::IntegerLiteral>(Expr));
         auto _S = new AST::IntegerLiteral();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -122,6 +126,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::FixedPointLiteral*>(llvm::cast<clang::FixedPointLiteral>(Expr));
         auto _S = new AST::FixedPointLiteral();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -144,6 +149,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CharacterLiteral*>(llvm::cast<clang::CharacterLiteral>(Expr));
         auto _S = new AST::CharacterLiteral();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -167,6 +173,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::FloatingLiteral*>(llvm::cast<clang::FloatingLiteral>(Expr));
         auto _S = new AST::FloatingLiteral();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -190,6 +197,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ImaginaryLiteral*>(llvm::cast<clang::ImaginaryLiteral>(Expr));
         auto _S = new AST::ImaginaryLiteral();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -212,6 +220,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::StringLiteral*>(llvm::cast<clang::StringLiteral>(Expr));
         auto _S = new AST::StringLiteral();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -248,6 +257,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::PredefinedExpr*>(llvm::cast<clang::PredefinedExpr>(Expr));
         auto _S = new AST::PredefinedExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -270,6 +280,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ParenExpr*>(llvm::cast<clang::ParenExpr>(Expr));
         auto _S = new AST::ParenExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -292,6 +303,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::UnaryOperator*>(llvm::cast<clang::UnaryOperator>(Expr));
         auto _S = new AST::UnaryOperator();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -322,6 +334,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::OffsetOfExpr*>(llvm::cast<clang::OffsetOfExpr>(Expr));
         auto _S = new AST::OffsetOfExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -345,6 +358,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::UnaryExprOrTypeTraitExpr*>(llvm::cast<clang::UnaryExprOrTypeTraitExpr>(Expr));
         auto _S = new AST::UnaryExprOrTypeTraitExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -372,6 +386,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ArraySubscriptExpr*>(llvm::cast<clang::ArraySubscriptExpr>(Expr));
         auto _S = new AST::ArraySubscriptExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -397,6 +412,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CallExpr*>(llvm::cast<clang::CallExpr>(Expr));
         auto _S = new AST::CallExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -430,6 +446,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::MemberExpr*>(llvm::cast<clang::MemberExpr>(Expr));
         auto _S = new AST::MemberExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -459,6 +476,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CompoundLiteralExpr*>(llvm::cast<clang::CompoundLiteralExpr>(Expr));
         auto _S = new AST::CompoundLiteralExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -482,6 +500,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ImplicitCastExpr*>(llvm::cast<clang::ImplicitCastExpr>(Expr));
         auto _S = new AST::ImplicitCastExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -511,6 +530,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CStyleCastExpr*>(llvm::cast<clang::CStyleCastExpr>(Expr));
         auto _S = new AST::CStyleCastExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -540,6 +560,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::BinaryOperator*>(llvm::cast<clang::BinaryOperator>(Expr));
         auto _S = new AST::BinaryOperator();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -579,6 +600,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CompoundAssignOperator*>(llvm::cast<clang::CompoundAssignOperator>(Expr));
         auto _S = new AST::CompoundAssignOperator();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -620,6 +642,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ConditionalOperator*>(llvm::cast<clang::ConditionalOperator>(Expr));
         auto _S = new AST::ConditionalOperator();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -649,6 +672,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::BinaryConditionalOperator*>(llvm::cast<clang::BinaryConditionalOperator>(Expr));
         auto _S = new AST::BinaryConditionalOperator();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -678,6 +702,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::AddrLabelExpr*>(llvm::cast<clang::AddrLabelExpr>(Expr));
         auto _S = new AST::AddrLabelExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -699,6 +724,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::StmtExpr*>(llvm::cast<clang::StmtExpr>(Expr));
         auto _S = new AST::StmtExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -721,6 +747,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ShuffleVectorExpr*>(llvm::cast<clang::ShuffleVectorExpr>(Expr));
         auto _S = new AST::ShuffleVectorExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -743,6 +770,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ConvertVectorExpr*>(llvm::cast<clang::ConvertVectorExpr>(Expr));
         auto _S = new AST::ConvertVectorExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -765,6 +793,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ChooseExpr*>(llvm::cast<clang::ChooseExpr>(Expr));
         auto _S = new AST::ChooseExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -792,6 +821,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::GNUNullExpr*>(llvm::cast<clang::GNUNullExpr>(Expr));
         auto _S = new AST::GNUNullExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -813,6 +843,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::VAArgExpr*>(llvm::cast<clang::VAArgExpr>(Expr));
         auto _S = new AST::VAArgExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -836,6 +867,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::InitListExpr*>(llvm::cast<clang::InitListExpr>(Expr));
         auto _S = new AST::InitListExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -869,6 +901,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::DesignatedInitExpr*>(llvm::cast<clang::DesignatedInitExpr>(Expr));
         auto _S = new AST::DesignatedInitExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -894,6 +927,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::NoInitExpr*>(llvm::cast<clang::NoInitExpr>(Expr));
         auto _S = new AST::NoInitExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -915,6 +949,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::DesignatedInitUpdateExpr*>(llvm::cast<clang::DesignatedInitUpdateExpr>(Expr));
         auto _S = new AST::DesignatedInitUpdateExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -938,6 +973,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ArrayInitLoopExpr*>(llvm::cast<clang::ArrayInitLoopExpr>(Expr));
         auto _S = new AST::ArrayInitLoopExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -961,6 +997,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ArrayInitIndexExpr*>(llvm::cast<clang::ArrayInitIndexExpr>(Expr));
         auto _S = new AST::ArrayInitIndexExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -982,6 +1019,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ImplicitValueInitExpr*>(llvm::cast<clang::ImplicitValueInitExpr>(Expr));
         auto _S = new AST::ImplicitValueInitExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1003,6 +1041,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ParenListExpr*>(llvm::cast<clang::ParenListExpr>(Expr));
         auto _S = new AST::ParenListExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1025,6 +1064,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::GenericSelectionExpr*>(llvm::cast<clang::GenericSelectionExpr>(Expr));
         auto _S = new AST::GenericSelectionExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1051,6 +1091,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ExtVectorElementExpr*>(llvm::cast<clang::ExtVectorElementExpr>(Expr));
         auto _S = new AST::ExtVectorElementExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1076,6 +1117,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::BlockExpr*>(llvm::cast<clang::BlockExpr>(Expr));
         auto _S = new AST::BlockExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1098,6 +1140,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::AsTypeExpr*>(llvm::cast<clang::AsTypeExpr>(Expr));
         auto _S = new AST::AsTypeExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1120,6 +1163,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::PseudoObjectExpr*>(llvm::cast<clang::PseudoObjectExpr>(Expr));
         auto _S = new AST::PseudoObjectExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1145,6 +1189,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::AtomicExpr*>(llvm::cast<clang::AtomicExpr>(Expr));
         auto _S = new AST::AtomicExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1179,6 +1224,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::TypoExpr*>(llvm::cast<clang::TypoExpr>(Expr));
         auto _S = new AST::TypoExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1200,6 +1246,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXOperatorCallExpr*>(llvm::cast<clang::CXXOperatorCallExpr>(Expr));
         auto _S = new AST::CXXOperatorCallExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1237,6 +1284,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXMemberCallExpr*>(llvm::cast<clang::CXXMemberCallExpr>(Expr));
         auto _S = new AST::CXXMemberCallExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1272,6 +1320,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CUDAKernelCallExpr*>(llvm::cast<clang::CUDAKernelCallExpr>(Expr));
         auto _S = new AST::CUDAKernelCallExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1306,6 +1355,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXStaticCastExpr*>(llvm::cast<clang::CXXStaticCastExpr>(Expr));
         auto _S = new AST::CXXStaticCastExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1336,6 +1386,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXDynamicCastExpr*>(llvm::cast<clang::CXXDynamicCastExpr>(Expr));
         auto _S = new AST::CXXDynamicCastExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1367,6 +1418,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXReinterpretCastExpr*>(llvm::cast<clang::CXXReinterpretCastExpr>(Expr));
         auto _S = new AST::CXXReinterpretCastExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1397,6 +1449,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXConstCastExpr*>(llvm::cast<clang::CXXConstCastExpr>(Expr));
         auto _S = new AST::CXXConstCastExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1427,6 +1480,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::UserDefinedLiteral*>(llvm::cast<clang::UserDefinedLiteral>(Expr));
         auto _S = new AST::UserDefinedLiteral();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1462,6 +1516,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXBoolLiteralExpr*>(llvm::cast<clang::CXXBoolLiteralExpr>(Expr));
         auto _S = new AST::CXXBoolLiteralExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1484,6 +1539,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXNullPtrLiteralExpr*>(llvm::cast<clang::CXXNullPtrLiteralExpr>(Expr));
         auto _S = new AST::CXXNullPtrLiteralExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1505,6 +1561,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXStdInitializerListExpr*>(llvm::cast<clang::CXXStdInitializerListExpr>(Expr));
         auto _S = new AST::CXXStdInitializerListExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1527,6 +1584,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXTypeidExpr*>(llvm::cast<clang::CXXTypeidExpr>(Expr));
         auto _S = new AST::CXXTypeidExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1551,6 +1609,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::MSPropertyRefExpr*>(llvm::cast<clang::MSPropertyRefExpr>(Expr));
         auto _S = new AST::MSPropertyRefExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1575,6 +1634,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::MSPropertySubscriptExpr*>(llvm::cast<clang::MSPropertySubscriptExpr>(Expr));
         auto _S = new AST::MSPropertySubscriptExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1598,6 +1658,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXUuidofExpr*>(llvm::cast<clang::CXXUuidofExpr>(Expr));
         auto _S = new AST::CXXUuidofExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1622,6 +1683,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXThisExpr*>(llvm::cast<clang::CXXThisExpr>(Expr));
         auto _S = new AST::CXXThisExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1644,6 +1706,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXThrowExpr*>(llvm::cast<clang::CXXThrowExpr>(Expr));
         auto _S = new AST::CXXThrowExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1667,6 +1730,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXDefaultArgExpr*>(llvm::cast<clang::CXXDefaultArgExpr>(Expr));
         auto _S = new AST::CXXDefaultArgExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1689,6 +1753,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXDefaultInitExpr*>(llvm::cast<clang::CXXDefaultInitExpr>(Expr));
         auto _S = new AST::CXXDefaultInitExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1712,6 +1777,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXBindTemporaryExpr*>(llvm::cast<clang::CXXBindTemporaryExpr>(Expr));
         auto _S = new AST::CXXBindTemporaryExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1734,6 +1800,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXConstructExpr*>(llvm::cast<clang::CXXConstructExpr>(Expr));
         auto _S = new AST::CXXConstructExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1766,6 +1833,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXInheritedCtorInitExpr*>(llvm::cast<clang::CXXInheritedCtorInitExpr>(Expr));
         auto _S = new AST::CXXInheritedCtorInitExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1789,6 +1857,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXFunctionalCastExpr*>(llvm::cast<clang::CXXFunctionalCastExpr>(Expr));
         auto _S = new AST::CXXFunctionalCastExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1819,6 +1888,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXTemporaryObjectExpr*>(llvm::cast<clang::CXXTemporaryObjectExpr>(Expr));
         auto _S = new AST::CXXTemporaryObjectExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1851,6 +1921,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::LambdaExpr*>(llvm::cast<clang::LambdaExpr>(Expr));
         auto _S = new AST::LambdaExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1884,6 +1955,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXScalarValueInitExpr*>(llvm::cast<clang::CXXScalarValueInitExpr>(Expr));
         auto _S = new AST::CXXScalarValueInitExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1905,6 +1977,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXNewExpr*>(llvm::cast<clang::CXXNewExpr>(Expr));
         auto _S = new AST::CXXNewExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1943,6 +2016,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXDeleteExpr*>(llvm::cast<clang::CXXDeleteExpr>(Expr));
         auto _S = new AST::CXXDeleteExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1970,6 +2044,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXPseudoDestructorExpr*>(llvm::cast<clang::CXXPseudoDestructorExpr>(Expr));
         auto _S = new AST::CXXPseudoDestructorExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -1995,6 +2070,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::TypeTraitExpr*>(llvm::cast<clang::TypeTraitExpr>(Expr));
         auto _S = new AST::TypeTraitExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2018,6 +2094,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ArrayTypeTraitExpr*>(llvm::cast<clang::ArrayTypeTraitExpr>(Expr));
         auto _S = new AST::ArrayTypeTraitExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2042,6 +2119,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ExpressionTraitExpr*>(llvm::cast<clang::ExpressionTraitExpr>(Expr));
         auto _S = new AST::ExpressionTraitExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2065,6 +2143,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::UnresolvedLookupExpr*>(llvm::cast<clang::UnresolvedLookupExpr>(Expr));
         auto _S = new AST::UnresolvedLookupExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2092,6 +2171,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::DependentScopeDeclRefExpr*>(llvm::cast<clang::DependentScopeDeclRefExpr>(Expr));
         auto _S = new AST::DependentScopeDeclRefExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2116,6 +2196,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::ExprWithCleanups*>(llvm::cast<clang::ExprWithCleanups>(Expr));
         auto _S = new AST::ExprWithCleanups();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2140,6 +2221,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXUnresolvedConstructExpr*>(llvm::cast<clang::CXXUnresolvedConstructExpr>(Expr));
         auto _S = new AST::CXXUnresolvedConstructExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2169,6 +2251,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXDependentScopeMemberExpr*>(llvm::cast<clang::CXXDependentScopeMemberExpr>(Expr));
         auto _S = new AST::CXXDependentScopeMemberExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2198,6 +2281,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::UnresolvedMemberExpr*>(llvm::cast<clang::UnresolvedMemberExpr>(Expr));
         auto _S = new AST::UnresolvedMemberExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2228,6 +2312,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXNoexceptExpr*>(llvm::cast<clang::CXXNoexceptExpr>(Expr));
         auto _S = new AST::CXXNoexceptExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2251,6 +2336,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::PackExpansionExpr*>(llvm::cast<clang::PackExpansionExpr>(Expr));
         auto _S = new AST::PackExpansionExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2273,6 +2359,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::SizeOfPackExpr*>(llvm::cast<clang::SizeOfPackExpr>(Expr));
         auto _S = new AST::SizeOfPackExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2297,6 +2384,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::SubstNonTypeTemplateParmExpr*>(llvm::cast<clang::SubstNonTypeTemplateParmExpr>(Expr));
         auto _S = new AST::SubstNonTypeTemplateParmExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2319,6 +2407,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::SubstNonTypeTemplateParmPackExpr*>(llvm::cast<clang::SubstNonTypeTemplateParmPackExpr>(Expr));
         auto _S = new AST::SubstNonTypeTemplateParmPackExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2341,6 +2430,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::FunctionParmPackExpr*>(llvm::cast<clang::FunctionParmPackExpr>(Expr));
         auto _S = new AST::FunctionParmPackExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2363,6 +2453,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::MaterializeTemporaryExpr*>(llvm::cast<clang::MaterializeTemporaryExpr>(Expr));
         auto _S = new AST::MaterializeTemporaryExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2388,6 +2479,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CXXFoldExpr*>(llvm::cast<clang::CXXFoldExpr>(Expr));
         auto _S = new AST::CXXFoldExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2416,6 +2508,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CoawaitExpr*>(llvm::cast<clang::CoawaitExpr>(Expr));
         auto _S = new AST::CoawaitExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2444,6 +2537,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::DependentCoawaitExpr*>(llvm::cast<clang::DependentCoawaitExpr>(Expr));
         auto _S = new AST::DependentCoawaitExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
@@ -2467,6 +2561,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
     {
         auto S = const_cast<clang::CoyieldExpr*>(llvm::cast<clang::CoyieldExpr>(Expr));
         auto _S = new AST::CoyieldExpr();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->type = GetQualifiedType(S->getType());
         _S->valueDependent = S->isValueDependent();
diff --git a/src/CppParser/ParseStmt.cpp b/src/CppParser/ParseStmt.cpp
index ead7f9a286..9c7c6f4e13 100644
--- a/src/CppParser/ParseStmt.cpp
+++ b/src/CppParser/ParseStmt.cpp
@@ -26,6 +26,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::DeclStmt*>(llvm::cast<clang::DeclStmt>(Stmt));
         auto _S = new AST::DeclStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->isSingleDecl = S->isSingleDecl();
         if (S->isSingleDecl())
@@ -42,6 +43,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::NullStmt*>(llvm::cast<clang::NullStmt>(Stmt));
         auto _S = new AST::NullStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->hasLeadingEmptyMacro = S->hasLeadingEmptyMacro();
         _Stmt = _S;
@@ -51,6 +53,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::CompoundStmt*>(llvm::cast<clang::CompoundStmt>(Stmt));
         auto _S = new AST::CompoundStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->body_empty = S->body_empty();
         _S->size = S->size();
@@ -68,6 +71,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::CaseStmt*>(llvm::cast<clang::CaseStmt>(Stmt));
         auto _S = new AST::CaseStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->subStmt = static_cast<AST::Stmt*>(WalkStatement(S->getSubStmt()));
         _S->lHS = static_cast<AST::Expr*>(WalkExpression(S->getLHS()));
@@ -81,6 +85,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::DefaultStmt*>(llvm::cast<clang::DefaultStmt>(Stmt));
         auto _S = new AST::DefaultStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->subStmt = static_cast<AST::Stmt*>(WalkStatement(S->getSubStmt()));
         _S->subStmt = static_cast<AST::Stmt*>(WalkStatement(S->getSubStmt()));
@@ -91,6 +96,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::LabelStmt*>(llvm::cast<clang::LabelStmt>(Stmt));
         auto _S = new AST::LabelStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->subStmt = static_cast<AST::Stmt*>(WalkStatement(S->getSubStmt()));
         _S->name = S->getName();
@@ -101,6 +107,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::AttributedStmt*>(llvm::cast<clang::AttributedStmt>(Stmt));
         auto _S = new AST::AttributedStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->subStmt = static_cast<AST::Stmt*>(WalkStatement(S->getSubStmt()));
         _Stmt = _S;
@@ -110,6 +117,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::IfStmt*>(llvm::cast<clang::IfStmt>(Stmt));
         auto _S = new AST::IfStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->cond = static_cast<AST::Expr*>(WalkExpression(S->getCond()));
         _S->then = static_cast<AST::Stmt*>(WalkStatement(S->getThen()));
@@ -128,6 +136,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::SwitchStmt*>(llvm::cast<clang::SwitchStmt>(Stmt));
         auto _S = new AST::SwitchStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->cond = static_cast<AST::Expr*>(WalkExpression(S->getCond()));
         _S->body = static_cast<AST::Stmt*>(WalkStatement(S->getBody()));
@@ -143,6 +152,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::WhileStmt*>(llvm::cast<clang::WhileStmt>(Stmt));
         auto _S = new AST::WhileStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->cond = static_cast<AST::Expr*>(WalkExpression(S->getCond()));
         _S->body = static_cast<AST::Stmt*>(WalkStatement(S->getBody()));
@@ -155,6 +165,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::DoStmt*>(llvm::cast<clang::DoStmt>(Stmt));
         auto _S = new AST::DoStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->cond = static_cast<AST::Expr*>(WalkExpression(S->getCond()));
         _S->body = static_cast<AST::Stmt*>(WalkStatement(S->getBody()));
@@ -165,6 +176,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::ForStmt*>(llvm::cast<clang::ForStmt>(Stmt));
         auto _S = new AST::ForStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->init = static_cast<AST::Stmt*>(WalkStatement(S->getInit()));
         _S->cond = static_cast<AST::Expr*>(WalkExpression(S->getCond()));
@@ -178,6 +190,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::GotoStmt*>(llvm::cast<clang::GotoStmt>(Stmt));
         auto _S = new AST::GotoStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _Stmt = _S;
         break;
@@ -186,6 +199,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::IndirectGotoStmt*>(llvm::cast<clang::IndirectGotoStmt>(Stmt));
         auto _S = new AST::IndirectGotoStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->target = static_cast<AST::Expr*>(WalkExpression(S->getTarget()));
         _Stmt = _S;
@@ -195,6 +209,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::ContinueStmt*>(llvm::cast<clang::ContinueStmt>(Stmt));
         auto _S = new AST::ContinueStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _Stmt = _S;
         break;
@@ -203,6 +218,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::BreakStmt*>(llvm::cast<clang::BreakStmt>(Stmt));
         auto _S = new AST::BreakStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _Stmt = _S;
         break;
@@ -211,6 +227,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::ReturnStmt*>(llvm::cast<clang::ReturnStmt>(Stmt));
         auto _S = new AST::ReturnStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->retValue = static_cast<AST::Expr*>(WalkExpression(S->getRetValue()));
         _Stmt = _S;
@@ -220,6 +237,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::GCCAsmStmt*>(llvm::cast<clang::GCCAsmStmt>(Stmt));
         auto _S = new AST::GCCAsmStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->simple = S->isSimple();
         _S->_volatile = S->isVolatile();
@@ -244,6 +262,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::MSAsmStmt*>(llvm::cast<clang::MSAsmStmt>(Stmt));
         auto _S = new AST::MSAsmStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->simple = S->isSimple();
         _S->_volatile = S->isVolatile();
@@ -271,6 +290,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::SEHExceptStmt*>(llvm::cast<clang::SEHExceptStmt>(Stmt));
         auto _S = new AST::SEHExceptStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->filterExpr = static_cast<AST::Expr*>(WalkExpression(S->getFilterExpr()));
         _S->block = static_cast<AST::CompoundStmt*>(WalkStatement(S->getBlock()));
@@ -281,6 +301,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::SEHFinallyStmt*>(llvm::cast<clang::SEHFinallyStmt>(Stmt));
         auto _S = new AST::SEHFinallyStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->block = static_cast<AST::CompoundStmt*>(WalkStatement(S->getBlock()));
         _Stmt = _S;
@@ -290,6 +311,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::SEHTryStmt*>(llvm::cast<clang::SEHTryStmt>(Stmt));
         auto _S = new AST::SEHTryStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->isCXXTry = S->getIsCXXTry();
         _S->tryBlock = static_cast<AST::CompoundStmt*>(WalkStatement(S->getTryBlock()));
@@ -303,6 +325,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::SEHLeaveStmt*>(llvm::cast<clang::SEHLeaveStmt>(Stmt));
         auto _S = new AST::SEHLeaveStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _Stmt = _S;
         break;
@@ -311,6 +334,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::CapturedStmt*>(llvm::cast<clang::CapturedStmt>(Stmt));
         auto _S = new AST::CapturedStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->capturedStmt = static_cast<AST::Stmt*>(WalkStatement(S->getCapturedStmt()));
         _S->capture_size = S->capture_size();
@@ -326,6 +350,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::CXXCatchStmt*>(llvm::cast<clang::CXXCatchStmt>(Stmt));
         auto _S = new AST::CXXCatchStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->caughtType = GetQualifiedType(S->getCaughtType());
         _S->handlerBlock = static_cast<AST::Stmt*>(WalkStatement(S->getHandlerBlock()));
@@ -336,6 +361,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::CXXTryStmt*>(llvm::cast<clang::CXXTryStmt>(Stmt));
         auto _S = new AST::CXXTryStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->tryBlock = static_cast<AST::CompoundStmt*>(WalkStatement(S->getTryBlock()));
         _S->numHandlers = S->getNumHandlers();
@@ -346,6 +372,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::CXXForRangeStmt*>(llvm::cast<clang::CXXForRangeStmt>(Stmt));
         auto _S = new AST::CXXForRangeStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->init = static_cast<AST::Stmt*>(WalkStatement(S->getInit()));
         _S->rangeInit = static_cast<AST::Expr*>(WalkExpression(S->getRangeInit()));
@@ -363,6 +390,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::MSDependentExistsStmt*>(llvm::cast<clang::MSDependentExistsStmt>(Stmt));
         auto _S = new AST::MSDependentExistsStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->isIfExists = S->isIfExists();
         _S->isIfNotExists = S->isIfNotExists();
@@ -374,6 +402,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::CoroutineBodyStmt*>(llvm::cast<clang::CoroutineBodyStmt>(Stmt));
         auto _S = new AST::CoroutineBodyStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->hasDependentPromiseType = S->hasDependentPromiseType();
         _S->body = static_cast<AST::Stmt*>(WalkStatement(S->getBody()));
@@ -395,6 +424,7 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
     {
         auto S = const_cast<clang::CoreturnStmt*>(llvm::cast<clang::CoreturnStmt>(Stmt));
         auto _S = new AST::CoreturnStmt();
+        _S->stmtClass = (Stmt::StmtClass) S->getStmtClass();
         _S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
         _S->isImplicit = S->isImplicit();
         _S->operand = static_cast<AST::Expr*>(WalkExpression(S->getOperand()));
diff --git a/src/CppParser/Stmt.cpp b/src/CppParser/Stmt.cpp
index 943b0b27eb..70a549bfc5 100644
--- a/src/CppParser/Stmt.cpp
+++ b/src/CppParser/Stmt.cpp
@@ -14,6 +14,7 @@ namespace CppSharp { namespace CppParser { namespace AST {
 Stmt::Stmt()
     : stmtClass(StmtClass::NoStmt)
     , sourceRange(SourceRange())
+    , beginLoc(SourceLocation())
     , endLoc(SourceLocation())
     , stripLabelLikeStatements(nullptr)
 {
@@ -22,6 +23,7 @@ Stmt::Stmt()
 Stmt::Stmt(StmtClass klass)
     : stmtClass(klass)
     , sourceRange(SourceRange())
+    , beginLoc(SourceLocation())
     , endLoc(SourceLocation())
     , stripLabelLikeStatements(nullptr)
 {
diff --git a/src/CppParser/Stmt.h b/src/CppParser/Stmt.h
index a215e5dc24..9f5e036793 100644
--- a/src/CppParser/Stmt.h
+++ b/src/CppParser/Stmt.h
@@ -15,144 +15,145 @@ namespace CppSharp { namespace CppParser { namespace AST {
 class Expr;
 class Declaration;
 
-enum class StmtClass
-{
-    NoStmt = 0,
-    GCCAsmStmt = 1,
-    MSAsmStmt = 2,
-    AttributedStmt = 3,
-    BreakStmt = 4,
-    CXXCatchStmt = 5,
-    CXXForRangeStmt = 6,
-    CXXTryStmt = 7,
-    CapturedStmt = 8,
-    CompoundStmt = 9,
-    ContinueStmt = 10,
-    CoreturnStmt = 11,
-    CoroutineBodyStmt = 12,
-    DeclStmt = 13,
-    DoStmt = 14,
-    BinaryConditionalOperator = 15,
-    ConditionalOperator = 16,
-    AddrLabelExpr = 17,
-    ArrayInitIndexExpr = 18,
-    ArrayInitLoopExpr = 19,
-    ArraySubscriptExpr = 20,
-    ArrayTypeTraitExpr = 21,
-    AsTypeExpr = 22,
-    AtomicExpr = 23,
-    BinaryOperator = 24,
-    CompoundAssignOperator = 25,
-    BlockExpr = 26,
-    CXXBindTemporaryExpr = 27,
-    CXXBoolLiteralExpr = 28,
-    CXXConstructExpr = 29,
-    CXXTemporaryObjectExpr = 30,
-    CXXDefaultArgExpr = 31,
-    CXXDefaultInitExpr = 32,
-    CXXDeleteExpr = 33,
-    CXXDependentScopeMemberExpr = 34,
-    CXXFoldExpr = 35,
-    CXXInheritedCtorInitExpr = 36,
-    CXXNewExpr = 37,
-    CXXNoexceptExpr = 38,
-    CXXNullPtrLiteralExpr = 39,
-    CXXPseudoDestructorExpr = 40,
-    CXXScalarValueInitExpr = 41,
-    CXXStdInitializerListExpr = 42,
-    CXXThisExpr = 43,
-    CXXThrowExpr = 44,
-    CXXTypeidExpr = 45,
-    CXXUnresolvedConstructExpr = 46,
-    CXXUuidofExpr = 47,
-    CallExpr = 48,
-    CUDAKernelCallExpr = 49,
-    CXXMemberCallExpr = 50,
-    CXXOperatorCallExpr = 51,
-    UserDefinedLiteral = 52,
-    CStyleCastExpr = 53,
-    CXXFunctionalCastExpr = 54,
-    CXXConstCastExpr = 55,
-    CXXDynamicCastExpr = 56,
-    CXXReinterpretCastExpr = 57,
-    CXXStaticCastExpr = 58,
-    ImplicitCastExpr = 60,
-    CharacterLiteral = 61,
-    ChooseExpr = 62,
-    CompoundLiteralExpr = 63,
-    ConvertVectorExpr = 64,
-    CoawaitExpr = 65,
-    CoyieldExpr = 66,
-    DeclRefExpr = 67,
-    DependentCoawaitExpr = 68,
-    DependentScopeDeclRefExpr = 69,
-    DesignatedInitExpr = 70,
-    DesignatedInitUpdateExpr = 71,
-    ExpressionTraitExpr = 72,
-    ExtVectorElementExpr = 73,
-    FixedPointLiteral = 74,
-    FloatingLiteral = 75,
-    ConstantExpr = 76,
-    ExprWithCleanups = 77,
-    FunctionParmPackExpr = 78,
-    GNUNullExpr = 79,
-    GenericSelectionExpr = 80,
-    ImaginaryLiteral = 81,
-    ImplicitValueInitExpr = 82,
-    InitListExpr = 83,
-    IntegerLiteral = 84,
-    LambdaExpr = 85,
-    MSPropertyRefExpr = 86,
-    MSPropertySubscriptExpr = 87,
-    MaterializeTemporaryExpr = 88,
-    MemberExpr = 89,
-    NoInitExpr = 90,
-    OffsetOfExpr = 107,
-    OpaqueValueExpr = 108,
-    UnresolvedLookupExpr = 109,
-    UnresolvedMemberExpr = 110,
-    PackExpansionExpr = 111,
-    ParenExpr = 112,
-    ParenListExpr = 113,
-    PredefinedExpr = 114,
-    PseudoObjectExpr = 115,
-    ShuffleVectorExpr = 116,
-    SizeOfPackExpr = 117,
-    StmtExpr = 118,
-    StringLiteral = 119,
-    SubstNonTypeTemplateParmExpr = 120,
-    SubstNonTypeTemplateParmPackExpr = 121,
-    TypeTraitExpr = 122,
-    TypoExpr = 123,
-    UnaryExprOrTypeTraitExpr = 124,
-    UnaryOperator = 125,
-    VAArgExpr = 126,
-    ForStmt = 127,
-    GotoStmt = 128,
-    IfStmt = 129,
-    IndirectGotoStmt = 130,
-    LabelStmt = 131,
-    MSDependentExistsStmt = 132,
-    NullStmt = 133,
-    ReturnStmt = 188,
-    SEHExceptStmt = 189,
-    SEHFinallyStmt = 190,
-    SEHLeaveStmt = 191,
-    SEHTryStmt = 192,
-    CaseStmt = 193,
-    DefaultStmt = 194,
-    SwitchStmt = 195,
-    WhileStmt = 196,
-
-};
-
 class CS_API Stmt
 {
 public:
+    enum class StmtClass
+    {
+        NoStmt = 0,
+        GCCAsmStmt = 1,
+        MSAsmStmt = 2,
+        AttributedStmt = 3,
+        BreakStmt = 4,
+        CXXCatchStmt = 5,
+        CXXForRangeStmt = 6,
+        CXXTryStmt = 7,
+        CapturedStmt = 8,
+        CompoundStmt = 9,
+        ContinueStmt = 10,
+        CoreturnStmt = 11,
+        CoroutineBodyStmt = 12,
+        DeclStmt = 13,
+        DoStmt = 14,
+        BinaryConditionalOperator = 15,
+        ConditionalOperator = 16,
+        AddrLabelExpr = 17,
+        ArrayInitIndexExpr = 18,
+        ArrayInitLoopExpr = 19,
+        ArraySubscriptExpr = 20,
+        ArrayTypeTraitExpr = 21,
+        AsTypeExpr = 22,
+        AtomicExpr = 23,
+        BinaryOperator = 24,
+        CompoundAssignOperator = 25,
+        BlockExpr = 26,
+        CXXBindTemporaryExpr = 27,
+        CXXBoolLiteralExpr = 28,
+        CXXConstructExpr = 29,
+        CXXTemporaryObjectExpr = 30,
+        CXXDefaultArgExpr = 31,
+        CXXDefaultInitExpr = 32,
+        CXXDeleteExpr = 33,
+        CXXDependentScopeMemberExpr = 34,
+        CXXFoldExpr = 35,
+        CXXInheritedCtorInitExpr = 36,
+        CXXNewExpr = 37,
+        CXXNoexceptExpr = 38,
+        CXXNullPtrLiteralExpr = 39,
+        CXXPseudoDestructorExpr = 40,
+        CXXScalarValueInitExpr = 41,
+        CXXStdInitializerListExpr = 42,
+        CXXThisExpr = 43,
+        CXXThrowExpr = 44,
+        CXXTypeidExpr = 45,
+        CXXUnresolvedConstructExpr = 46,
+        CXXUuidofExpr = 47,
+        CallExpr = 48,
+        CUDAKernelCallExpr = 49,
+        CXXMemberCallExpr = 50,
+        CXXOperatorCallExpr = 51,
+        UserDefinedLiteral = 52,
+        CStyleCastExpr = 53,
+        CXXFunctionalCastExpr = 54,
+        CXXConstCastExpr = 55,
+        CXXDynamicCastExpr = 56,
+        CXXReinterpretCastExpr = 57,
+        CXXStaticCastExpr = 58,
+        ImplicitCastExpr = 60,
+        CharacterLiteral = 61,
+        ChooseExpr = 62,
+        CompoundLiteralExpr = 63,
+        ConvertVectorExpr = 64,
+        CoawaitExpr = 65,
+        CoyieldExpr = 66,
+        DeclRefExpr = 67,
+        DependentCoawaitExpr = 68,
+        DependentScopeDeclRefExpr = 69,
+        DesignatedInitExpr = 70,
+        DesignatedInitUpdateExpr = 71,
+        ExpressionTraitExpr = 72,
+        ExtVectorElementExpr = 73,
+        FixedPointLiteral = 74,
+        FloatingLiteral = 75,
+        ConstantExpr = 76,
+        ExprWithCleanups = 77,
+        FunctionParmPackExpr = 78,
+        GNUNullExpr = 79,
+        GenericSelectionExpr = 80,
+        ImaginaryLiteral = 81,
+        ImplicitValueInitExpr = 82,
+        InitListExpr = 83,
+        IntegerLiteral = 84,
+        LambdaExpr = 85,
+        MSPropertyRefExpr = 86,
+        MSPropertySubscriptExpr = 87,
+        MaterializeTemporaryExpr = 88,
+        MemberExpr = 89,
+        NoInitExpr = 90,
+        OffsetOfExpr = 107,
+        OpaqueValueExpr = 108,
+        UnresolvedLookupExpr = 109,
+        UnresolvedMemberExpr = 110,
+        PackExpansionExpr = 111,
+        ParenExpr = 112,
+        ParenListExpr = 113,
+        PredefinedExpr = 114,
+        PseudoObjectExpr = 115,
+        ShuffleVectorExpr = 116,
+        SizeOfPackExpr = 117,
+        StmtExpr = 118,
+        StringLiteral = 119,
+        SubstNonTypeTemplateParmExpr = 120,
+        SubstNonTypeTemplateParmPackExpr = 121,
+        TypeTraitExpr = 122,
+        TypoExpr = 123,
+        UnaryExprOrTypeTraitExpr = 124,
+        UnaryOperator = 125,
+        VAArgExpr = 126,
+        ForStmt = 127,
+        GotoStmt = 128,
+        IfStmt = 129,
+        IndirectGotoStmt = 130,
+        LabelStmt = 131,
+        MSDependentExistsStmt = 132,
+        NullStmt = 133,
+        ReturnStmt = 188,
+        SEHExceptStmt = 189,
+        SEHFinallyStmt = 190,
+        SEHLeaveStmt = 191,
+        SEHTryStmt = 192,
+        CaseStmt = 193,
+        DefaultStmt = 194,
+        SwitchStmt = 195,
+        WhileStmt = 196,
+
+    };
+
     Stmt();
     Stmt(StmtClass klass);
     StmtClass stmtClass;
     SourceRange sourceRange;
+    SourceLocation beginLoc;
     SourceLocation endLoc;
     Stmt* stripLabelLikeStatements;
 };
diff --git a/src/Parser/ASTConverter.Expr.cs b/src/Parser/ASTConverter.Expr.cs
index 5963a1ba50..24c249df05 100644
--- a/src/Parser/ASTConverter.Expr.cs
+++ b/src/Parser/ASTConverter.Expr.cs
@@ -116,485 +116,485 @@ public virtual TRet Visit(Parser.AST.Expr expr)
             if (expr == null)
                 return default(TRet);
 
-            switch(expr.StmtClass)
+            switch(expr.stmtClass)
             {
-                case StmtClass.ConstantExpr:
+                case Stmt.StmtClass.ConstantExpr:
                 {
                     var _expr = ConstantExpr.__CreateInstance(expr.__Instance);
                     return VisitConstantExpr(_expr);
                 }
-                case StmtClass.OpaqueValueExpr:
+                case Stmt.StmtClass.OpaqueValueExpr:
                 {
                     var _expr = OpaqueValueExpr.__CreateInstance(expr.__Instance);
                     return VisitOpaqueValueExpr(_expr);
                 }
-                case StmtClass.DeclRefExpr:
+                case Stmt.StmtClass.DeclRefExpr:
                 {
                     var _expr = DeclRefExpr.__CreateInstance(expr.__Instance);
                     return VisitDeclRefExpr(_expr);
                 }
-                case StmtClass.IntegerLiteral:
+                case Stmt.StmtClass.IntegerLiteral:
                 {
                     var _expr = IntegerLiteral.__CreateInstance(expr.__Instance);
                     return VisitIntegerLiteral(_expr);
                 }
-                case StmtClass.FixedPointLiteral:
+                case Stmt.StmtClass.FixedPointLiteral:
                 {
                     var _expr = FixedPointLiteral.__CreateInstance(expr.__Instance);
                     return VisitFixedPointLiteral(_expr);
                 }
-                case StmtClass.CharacterLiteral:
+                case Stmt.StmtClass.CharacterLiteral:
                 {
                     var _expr = CharacterLiteral.__CreateInstance(expr.__Instance);
                     return VisitCharacterLiteral(_expr);
                 }
-                case StmtClass.FloatingLiteral:
+                case Stmt.StmtClass.FloatingLiteral:
                 {
                     var _expr = FloatingLiteral.__CreateInstance(expr.__Instance);
                     return VisitFloatingLiteral(_expr);
                 }
-                case StmtClass.ImaginaryLiteral:
+                case Stmt.StmtClass.ImaginaryLiteral:
                 {
                     var _expr = ImaginaryLiteral.__CreateInstance(expr.__Instance);
                     return VisitImaginaryLiteral(_expr);
                 }
-                case StmtClass.StringLiteral:
+                case Stmt.StmtClass.StringLiteral:
                 {
                     var _expr = StringLiteral.__CreateInstance(expr.__Instance);
                     return VisitStringLiteral(_expr);
                 }
-                case StmtClass.PredefinedExpr:
+                case Stmt.StmtClass.PredefinedExpr:
                 {
                     var _expr = PredefinedExpr.__CreateInstance(expr.__Instance);
                     return VisitPredefinedExpr(_expr);
                 }
-                case StmtClass.ParenExpr:
+                case Stmt.StmtClass.ParenExpr:
                 {
                     var _expr = ParenExpr.__CreateInstance(expr.__Instance);
                     return VisitParenExpr(_expr);
                 }
-                case StmtClass.UnaryOperator:
+                case Stmt.StmtClass.UnaryOperator:
                 {
                     var _expr = UnaryOperator.__CreateInstance(expr.__Instance);
                     return VisitUnaryOperator(_expr);
                 }
-                case StmtClass.OffsetOfExpr:
+                case Stmt.StmtClass.OffsetOfExpr:
                 {
                     var _expr = OffsetOfExpr.__CreateInstance(expr.__Instance);
                     return VisitOffsetOfExpr(_expr);
                 }
-                case StmtClass.UnaryExprOrTypeTraitExpr:
+                case Stmt.StmtClass.UnaryExprOrTypeTraitExpr:
                 {
                     var _expr = UnaryExprOrTypeTraitExpr.__CreateInstance(expr.__Instance);
                     return VisitUnaryExprOrTypeTraitExpr(_expr);
                 }
-                case StmtClass.ArraySubscriptExpr:
+                case Stmt.StmtClass.ArraySubscriptExpr:
                 {
                     var _expr = ArraySubscriptExpr.__CreateInstance(expr.__Instance);
                     return VisitArraySubscriptExpr(_expr);
                 }
-                case StmtClass.CallExpr:
+                case Stmt.StmtClass.CallExpr:
                 {
                     var _expr = CallExpr.__CreateInstance(expr.__Instance);
                     return VisitCallExpr(_expr);
                 }
-                case StmtClass.MemberExpr:
+                case Stmt.StmtClass.MemberExpr:
                 {
                     var _expr = MemberExpr.__CreateInstance(expr.__Instance);
                     return VisitMemberExpr(_expr);
                 }
-                case StmtClass.CompoundLiteralExpr:
+                case Stmt.StmtClass.CompoundLiteralExpr:
                 {
                     var _expr = CompoundLiteralExpr.__CreateInstance(expr.__Instance);
                     return VisitCompoundLiteralExpr(_expr);
                 }
-                case StmtClass.ImplicitCastExpr:
+                case Stmt.StmtClass.ImplicitCastExpr:
                 {
                     var _expr = ImplicitCastExpr.__CreateInstance(expr.__Instance);
                     return VisitImplicitCastExpr(_expr);
                 }
-                case StmtClass.CStyleCastExpr:
+                case Stmt.StmtClass.CStyleCastExpr:
                 {
                     var _expr = CStyleCastExpr.__CreateInstance(expr.__Instance);
                     return VisitCStyleCastExpr(_expr);
                 }
-                case StmtClass.BinaryOperator:
+                case Stmt.StmtClass.BinaryOperator:
                 {
                     var _expr = BinaryOperator.__CreateInstance(expr.__Instance);
                     return VisitBinaryOperator(_expr);
                 }
-                case StmtClass.CompoundAssignOperator:
+                case Stmt.StmtClass.CompoundAssignOperator:
                 {
                     var _expr = CompoundAssignOperator.__CreateInstance(expr.__Instance);
                     return VisitCompoundAssignOperator(_expr);
                 }
-                case StmtClass.ConditionalOperator:
+                case Stmt.StmtClass.ConditionalOperator:
                 {
                     var _expr = ConditionalOperator.__CreateInstance(expr.__Instance);
                     return VisitConditionalOperator(_expr);
                 }
-                case StmtClass.BinaryConditionalOperator:
+                case Stmt.StmtClass.BinaryConditionalOperator:
                 {
                     var _expr = BinaryConditionalOperator.__CreateInstance(expr.__Instance);
                     return VisitBinaryConditionalOperator(_expr);
                 }
-                case StmtClass.AddrLabelExpr:
+                case Stmt.StmtClass.AddrLabelExpr:
                 {
                     var _expr = AddrLabelExpr.__CreateInstance(expr.__Instance);
                     return VisitAddrLabelExpr(_expr);
                 }
-                case StmtClass.StmtExpr:
+                case Stmt.StmtClass.StmtExpr:
                 {
                     var _expr = StmtExpr.__CreateInstance(expr.__Instance);
                     return VisitStmtExpr(_expr);
                 }
-                case StmtClass.ShuffleVectorExpr:
+                case Stmt.StmtClass.ShuffleVectorExpr:
                 {
                     var _expr = ShuffleVectorExpr.__CreateInstance(expr.__Instance);
                     return VisitShuffleVectorExpr(_expr);
                 }
-                case StmtClass.ConvertVectorExpr:
+                case Stmt.StmtClass.ConvertVectorExpr:
                 {
                     var _expr = ConvertVectorExpr.__CreateInstance(expr.__Instance);
                     return VisitConvertVectorExpr(_expr);
                 }
-                case StmtClass.ChooseExpr:
+                case Stmt.StmtClass.ChooseExpr:
                 {
                     var _expr = ChooseExpr.__CreateInstance(expr.__Instance);
                     return VisitChooseExpr(_expr);
                 }
-                case StmtClass.GNUNullExpr:
+                case Stmt.StmtClass.GNUNullExpr:
                 {
                     var _expr = GNUNullExpr.__CreateInstance(expr.__Instance);
                     return VisitGNUNullExpr(_expr);
                 }
-                case StmtClass.VAArgExpr:
+                case Stmt.StmtClass.VAArgExpr:
                 {
                     var _expr = VAArgExpr.__CreateInstance(expr.__Instance);
                     return VisitVAArgExpr(_expr);
                 }
-                case StmtClass.InitListExpr:
+                case Stmt.StmtClass.InitListExpr:
                 {
                     var _expr = InitListExpr.__CreateInstance(expr.__Instance);
                     return VisitInitListExpr(_expr);
                 }
-                case StmtClass.DesignatedInitExpr:
+                case Stmt.StmtClass.DesignatedInitExpr:
                 {
                     var _expr = DesignatedInitExpr.__CreateInstance(expr.__Instance);
                     return VisitDesignatedInitExpr(_expr);
                 }
-                case StmtClass.NoInitExpr:
+                case Stmt.StmtClass.NoInitExpr:
                 {
                     var _expr = NoInitExpr.__CreateInstance(expr.__Instance);
                     return VisitNoInitExpr(_expr);
                 }
-                case StmtClass.DesignatedInitUpdateExpr:
+                case Stmt.StmtClass.DesignatedInitUpdateExpr:
                 {
                     var _expr = DesignatedInitUpdateExpr.__CreateInstance(expr.__Instance);
                     return VisitDesignatedInitUpdateExpr(_expr);
                 }
-                case StmtClass.ArrayInitLoopExpr:
+                case Stmt.StmtClass.ArrayInitLoopExpr:
                 {
                     var _expr = ArrayInitLoopExpr.__CreateInstance(expr.__Instance);
                     return VisitArrayInitLoopExpr(_expr);
                 }
-                case StmtClass.ArrayInitIndexExpr:
+                case Stmt.StmtClass.ArrayInitIndexExpr:
                 {
                     var _expr = ArrayInitIndexExpr.__CreateInstance(expr.__Instance);
                     return VisitArrayInitIndexExpr(_expr);
                 }
-                case StmtClass.ImplicitValueInitExpr:
+                case Stmt.StmtClass.ImplicitValueInitExpr:
                 {
                     var _expr = ImplicitValueInitExpr.__CreateInstance(expr.__Instance);
                     return VisitImplicitValueInitExpr(_expr);
                 }
-                case StmtClass.ParenListExpr:
+                case Stmt.StmtClass.ParenListExpr:
                 {
                     var _expr = ParenListExpr.__CreateInstance(expr.__Instance);
                     return VisitParenListExpr(_expr);
                 }
-                case StmtClass.GenericSelectionExpr:
+                case Stmt.StmtClass.GenericSelectionExpr:
                 {
                     var _expr = GenericSelectionExpr.__CreateInstance(expr.__Instance);
                     return VisitGenericSelectionExpr(_expr);
                 }
-                case StmtClass.ExtVectorElementExpr:
+                case Stmt.StmtClass.ExtVectorElementExpr:
                 {
                     var _expr = ExtVectorElementExpr.__CreateInstance(expr.__Instance);
                     return VisitExtVectorElementExpr(_expr);
                 }
-                case StmtClass.BlockExpr:
+                case Stmt.StmtClass.BlockExpr:
                 {
                     var _expr = BlockExpr.__CreateInstance(expr.__Instance);
                     return VisitBlockExpr(_expr);
                 }
-                case StmtClass.AsTypeExpr:
+                case Stmt.StmtClass.AsTypeExpr:
                 {
                     var _expr = AsTypeExpr.__CreateInstance(expr.__Instance);
                     return VisitAsTypeExpr(_expr);
                 }
-                case StmtClass.PseudoObjectExpr:
+                case Stmt.StmtClass.PseudoObjectExpr:
                 {
                     var _expr = PseudoObjectExpr.__CreateInstance(expr.__Instance);
                     return VisitPseudoObjectExpr(_expr);
                 }
-                case StmtClass.AtomicExpr:
+                case Stmt.StmtClass.AtomicExpr:
                 {
                     var _expr = AtomicExpr.__CreateInstance(expr.__Instance);
                     return VisitAtomicExpr(_expr);
                 }
-                case StmtClass.TypoExpr:
+                case Stmt.StmtClass.TypoExpr:
                 {
                     var _expr = TypoExpr.__CreateInstance(expr.__Instance);
                     return VisitTypoExpr(_expr);
                 }
-                case StmtClass.CXXOperatorCallExpr:
+                case Stmt.StmtClass.CXXOperatorCallExpr:
                 {
                     var _expr = CXXOperatorCallExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXOperatorCallExpr(_expr);
                 }
-                case StmtClass.CXXMemberCallExpr:
+                case Stmt.StmtClass.CXXMemberCallExpr:
                 {
                     var _expr = CXXMemberCallExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXMemberCallExpr(_expr);
                 }
-                case StmtClass.CUDAKernelCallExpr:
+                case Stmt.StmtClass.CUDAKernelCallExpr:
                 {
                     var _expr = CUDAKernelCallExpr.__CreateInstance(expr.__Instance);
                     return VisitCUDAKernelCallExpr(_expr);
                 }
-                case StmtClass.CXXStaticCastExpr:
+                case Stmt.StmtClass.CXXStaticCastExpr:
                 {
                     var _expr = CXXStaticCastExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXStaticCastExpr(_expr);
                 }
-                case StmtClass.CXXDynamicCastExpr:
+                case Stmt.StmtClass.CXXDynamicCastExpr:
                 {
                     var _expr = CXXDynamicCastExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXDynamicCastExpr(_expr);
                 }
-                case StmtClass.CXXReinterpretCastExpr:
+                case Stmt.StmtClass.CXXReinterpretCastExpr:
                 {
                     var _expr = CXXReinterpretCastExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXReinterpretCastExpr(_expr);
                 }
-                case StmtClass.CXXConstCastExpr:
+                case Stmt.StmtClass.CXXConstCastExpr:
                 {
                     var _expr = CXXConstCastExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXConstCastExpr(_expr);
                 }
-                case StmtClass.UserDefinedLiteral:
+                case Stmt.StmtClass.UserDefinedLiteral:
                 {
                     var _expr = UserDefinedLiteral.__CreateInstance(expr.__Instance);
                     return VisitUserDefinedLiteral(_expr);
                 }
-                case StmtClass.CXXBoolLiteralExpr:
+                case Stmt.StmtClass.CXXBoolLiteralExpr:
                 {
                     var _expr = CXXBoolLiteralExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXBoolLiteralExpr(_expr);
                 }
-                case StmtClass.CXXNullPtrLiteralExpr:
+                case Stmt.StmtClass.CXXNullPtrLiteralExpr:
                 {
                     var _expr = CXXNullPtrLiteralExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXNullPtrLiteralExpr(_expr);
                 }
-                case StmtClass.CXXStdInitializerListExpr:
+                case Stmt.StmtClass.CXXStdInitializerListExpr:
                 {
                     var _expr = CXXStdInitializerListExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXStdInitializerListExpr(_expr);
                 }
-                case StmtClass.CXXTypeidExpr:
+                case Stmt.StmtClass.CXXTypeidExpr:
                 {
                     var _expr = CXXTypeidExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXTypeidExpr(_expr);
                 }
-                case StmtClass.MSPropertyRefExpr:
+                case Stmt.StmtClass.MSPropertyRefExpr:
                 {
                     var _expr = MSPropertyRefExpr.__CreateInstance(expr.__Instance);
                     return VisitMSPropertyRefExpr(_expr);
                 }
-                case StmtClass.MSPropertySubscriptExpr:
+                case Stmt.StmtClass.MSPropertySubscriptExpr:
                 {
                     var _expr = MSPropertySubscriptExpr.__CreateInstance(expr.__Instance);
                     return VisitMSPropertySubscriptExpr(_expr);
                 }
-                case StmtClass.CXXUuidofExpr:
+                case Stmt.StmtClass.CXXUuidofExpr:
                 {
                     var _expr = CXXUuidofExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXUuidofExpr(_expr);
                 }
-                case StmtClass.CXXThisExpr:
+                case Stmt.StmtClass.CXXThisExpr:
                 {
                     var _expr = CXXThisExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXThisExpr(_expr);
                 }
-                case StmtClass.CXXThrowExpr:
+                case Stmt.StmtClass.CXXThrowExpr:
                 {
                     var _expr = CXXThrowExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXThrowExpr(_expr);
                 }
-                case StmtClass.CXXDefaultArgExpr:
+                case Stmt.StmtClass.CXXDefaultArgExpr:
                 {
                     var _expr = CXXDefaultArgExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXDefaultArgExpr(_expr);
                 }
-                case StmtClass.CXXDefaultInitExpr:
+                case Stmt.StmtClass.CXXDefaultInitExpr:
                 {
                     var _expr = CXXDefaultInitExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXDefaultInitExpr(_expr);
                 }
-                case StmtClass.CXXBindTemporaryExpr:
+                case Stmt.StmtClass.CXXBindTemporaryExpr:
                 {
                     var _expr = CXXBindTemporaryExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXBindTemporaryExpr(_expr);
                 }
-                case StmtClass.CXXConstructExpr:
+                case Stmt.StmtClass.CXXConstructExpr:
                 {
                     var _expr = CXXConstructExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXConstructExpr(_expr);
                 }
-                case StmtClass.CXXInheritedCtorInitExpr:
+                case Stmt.StmtClass.CXXInheritedCtorInitExpr:
                 {
                     var _expr = CXXInheritedCtorInitExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXInheritedCtorInitExpr(_expr);
                 }
-                case StmtClass.CXXFunctionalCastExpr:
+                case Stmt.StmtClass.CXXFunctionalCastExpr:
                 {
                     var _expr = CXXFunctionalCastExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXFunctionalCastExpr(_expr);
                 }
-                case StmtClass.CXXTemporaryObjectExpr:
+                case Stmt.StmtClass.CXXTemporaryObjectExpr:
                 {
                     var _expr = CXXTemporaryObjectExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXTemporaryObjectExpr(_expr);
                 }
-                case StmtClass.LambdaExpr:
+                case Stmt.StmtClass.LambdaExpr:
                 {
                     var _expr = LambdaExpr.__CreateInstance(expr.__Instance);
                     return VisitLambdaExpr(_expr);
                 }
-                case StmtClass.CXXScalarValueInitExpr:
+                case Stmt.StmtClass.CXXScalarValueInitExpr:
                 {
                     var _expr = CXXScalarValueInitExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXScalarValueInitExpr(_expr);
                 }
-                case StmtClass.CXXNewExpr:
+                case Stmt.StmtClass.CXXNewExpr:
                 {
                     var _expr = CXXNewExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXNewExpr(_expr);
                 }
-                case StmtClass.CXXDeleteExpr:
+                case Stmt.StmtClass.CXXDeleteExpr:
                 {
                     var _expr = CXXDeleteExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXDeleteExpr(_expr);
                 }
-                case StmtClass.CXXPseudoDestructorExpr:
+                case Stmt.StmtClass.CXXPseudoDestructorExpr:
                 {
                     var _expr = CXXPseudoDestructorExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXPseudoDestructorExpr(_expr);
                 }
-                case StmtClass.TypeTraitExpr:
+                case Stmt.StmtClass.TypeTraitExpr:
                 {
                     var _expr = TypeTraitExpr.__CreateInstance(expr.__Instance);
                     return VisitTypeTraitExpr(_expr);
                 }
-                case StmtClass.ArrayTypeTraitExpr:
+                case Stmt.StmtClass.ArrayTypeTraitExpr:
                 {
                     var _expr = ArrayTypeTraitExpr.__CreateInstance(expr.__Instance);
                     return VisitArrayTypeTraitExpr(_expr);
                 }
-                case StmtClass.ExpressionTraitExpr:
+                case Stmt.StmtClass.ExpressionTraitExpr:
                 {
                     var _expr = ExpressionTraitExpr.__CreateInstance(expr.__Instance);
                     return VisitExpressionTraitExpr(_expr);
                 }
-                case StmtClass.UnresolvedLookupExpr:
+                case Stmt.StmtClass.UnresolvedLookupExpr:
                 {
                     var _expr = UnresolvedLookupExpr.__CreateInstance(expr.__Instance);
                     return VisitUnresolvedLookupExpr(_expr);
                 }
-                case StmtClass.DependentScopeDeclRefExpr:
+                case Stmt.StmtClass.DependentScopeDeclRefExpr:
                 {
                     var _expr = DependentScopeDeclRefExpr.__CreateInstance(expr.__Instance);
                     return VisitDependentScopeDeclRefExpr(_expr);
                 }
-                case StmtClass.ExprWithCleanups:
+                case Stmt.StmtClass.ExprWithCleanups:
                 {
                     var _expr = ExprWithCleanups.__CreateInstance(expr.__Instance);
                     return VisitExprWithCleanups(_expr);
                 }
-                case StmtClass.CXXUnresolvedConstructExpr:
+                case Stmt.StmtClass.CXXUnresolvedConstructExpr:
                 {
                     var _expr = CXXUnresolvedConstructExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXUnresolvedConstructExpr(_expr);
                 }
-                case StmtClass.CXXDependentScopeMemberExpr:
+                case Stmt.StmtClass.CXXDependentScopeMemberExpr:
                 {
                     var _expr = CXXDependentScopeMemberExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXDependentScopeMemberExpr(_expr);
                 }
-                case StmtClass.UnresolvedMemberExpr:
+                case Stmt.StmtClass.UnresolvedMemberExpr:
                 {
                     var _expr = UnresolvedMemberExpr.__CreateInstance(expr.__Instance);
                     return VisitUnresolvedMemberExpr(_expr);
                 }
-                case StmtClass.CXXNoexceptExpr:
+                case Stmt.StmtClass.CXXNoexceptExpr:
                 {
                     var _expr = CXXNoexceptExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXNoexceptExpr(_expr);
                 }
-                case StmtClass.PackExpansionExpr:
+                case Stmt.StmtClass.PackExpansionExpr:
                 {
                     var _expr = PackExpansionExpr.__CreateInstance(expr.__Instance);
                     return VisitPackExpansionExpr(_expr);
                 }
-                case StmtClass.SizeOfPackExpr:
+                case Stmt.StmtClass.SizeOfPackExpr:
                 {
                     var _expr = SizeOfPackExpr.__CreateInstance(expr.__Instance);
                     return VisitSizeOfPackExpr(_expr);
                 }
-                case StmtClass.SubstNonTypeTemplateParmExpr:
+                case Stmt.StmtClass.SubstNonTypeTemplateParmExpr:
                 {
                     var _expr = SubstNonTypeTemplateParmExpr.__CreateInstance(expr.__Instance);
                     return VisitSubstNonTypeTemplateParmExpr(_expr);
                 }
-                case StmtClass.SubstNonTypeTemplateParmPackExpr:
+                case Stmt.StmtClass.SubstNonTypeTemplateParmPackExpr:
                 {
                     var _expr = SubstNonTypeTemplateParmPackExpr.__CreateInstance(expr.__Instance);
                     return VisitSubstNonTypeTemplateParmPackExpr(_expr);
                 }
-                case StmtClass.FunctionParmPackExpr:
+                case Stmt.StmtClass.FunctionParmPackExpr:
                 {
                     var _expr = FunctionParmPackExpr.__CreateInstance(expr.__Instance);
                     return VisitFunctionParmPackExpr(_expr);
                 }
-                case StmtClass.MaterializeTemporaryExpr:
+                case Stmt.StmtClass.MaterializeTemporaryExpr:
                 {
                     var _expr = MaterializeTemporaryExpr.__CreateInstance(expr.__Instance);
                     return VisitMaterializeTemporaryExpr(_expr);
                 }
-                case StmtClass.CXXFoldExpr:
+                case Stmt.StmtClass.CXXFoldExpr:
                 {
                     var _expr = CXXFoldExpr.__CreateInstance(expr.__Instance);
                     return VisitCXXFoldExpr(_expr);
                 }
-                case StmtClass.CoawaitExpr:
+                case Stmt.StmtClass.CoawaitExpr:
                 {
                     var _expr = CoawaitExpr.__CreateInstance(expr.__Instance);
                     return VisitCoawaitExpr(_expr);
                 }
-                case StmtClass.DependentCoawaitExpr:
+                case Stmt.StmtClass.DependentCoawaitExpr:
                 {
                     var _expr = DependentCoawaitExpr.__CreateInstance(expr.__Instance);
                     return VisitDependentCoawaitExpr(_expr);
                 }
-                case StmtClass.CoyieldExpr:
+                case Stmt.StmtClass.CoyieldExpr:
                 {
                     var _expr = CoyieldExpr.__CreateInstance(expr.__Instance);
                     return VisitCoyieldExpr(_expr);
                 }
                 default:
-                    throw new System.NotImplementedException(expr.StmtClass.ToString());
+                    throw new System.NotImplementedException(expr.stmtClass.ToString());
             }
         }
     }
@@ -604,7 +604,9 @@ public unsafe class ExprConverter : ExprVisitor<AST.Expr>
         public override AST.Expr VisitConstantExpr(ConstantExpr expr)
         {
             var _expr = new AST.ConstantExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -628,7 +630,9 @@ public override AST.Expr VisitConstantExpr(ConstantExpr expr)
         public override AST.Expr VisitOpaqueValueExpr(OpaqueValueExpr expr)
         {
             var _expr = new AST.OpaqueValueExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -654,7 +658,9 @@ public override AST.Expr VisitOpaqueValueExpr(OpaqueValueExpr expr)
         public override AST.Expr VisitDeclRefExpr(DeclRefExpr expr)
         {
             var _expr = new AST.DeclRefExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -689,7 +695,9 @@ public override AST.Expr VisitDeclRefExpr(DeclRefExpr expr)
         public override AST.Expr VisitIntegerLiteral(IntegerLiteral expr)
         {
             var _expr = new AST.IntegerLiteral();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -714,7 +722,9 @@ public override AST.Expr VisitIntegerLiteral(IntegerLiteral expr)
         public override AST.Expr VisitFixedPointLiteral(FixedPointLiteral expr)
         {
             var _expr = new AST.FixedPointLiteral();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -739,7 +749,9 @@ public override AST.Expr VisitFixedPointLiteral(FixedPointLiteral expr)
         public override AST.Expr VisitCharacterLiteral(CharacterLiteral expr)
         {
             var _expr = new AST.CharacterLiteral();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -765,7 +777,9 @@ public override AST.Expr VisitCharacterLiteral(CharacterLiteral expr)
         public override AST.Expr VisitFloatingLiteral(FloatingLiteral expr)
         {
             var _expr = new AST.FloatingLiteral();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -791,7 +805,9 @@ public override AST.Expr VisitFloatingLiteral(FloatingLiteral expr)
         public override AST.Expr VisitImaginaryLiteral(ImaginaryLiteral expr)
         {
             var _expr = new AST.ImaginaryLiteral();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -815,7 +831,9 @@ public override AST.Expr VisitImaginaryLiteral(ImaginaryLiteral expr)
         public override AST.Expr VisitStringLiteral(StringLiteral expr)
         {
             var _expr = new AST.StringLiteral();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -853,7 +871,9 @@ public override AST.Expr VisitStringLiteral(StringLiteral expr)
         public override AST.Expr VisitPredefinedExpr(PredefinedExpr expr)
         {
             var _expr = new AST.PredefinedExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -878,7 +898,9 @@ public override AST.Expr VisitPredefinedExpr(PredefinedExpr expr)
         public override AST.Expr VisitParenExpr(ParenExpr expr)
         {
             var _expr = new AST.ParenExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -904,7 +926,9 @@ public override AST.Expr VisitParenExpr(ParenExpr expr)
         public override AST.Expr VisitUnaryOperator(UnaryOperator expr)
         {
             var _expr = new AST.UnaryOperator();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -937,7 +961,9 @@ public override AST.Expr VisitUnaryOperator(UnaryOperator expr)
         public override AST.Expr VisitOffsetOfExpr(OffsetOfExpr expr)
         {
             var _expr = new AST.OffsetOfExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -964,7 +990,9 @@ public override AST.Expr VisitOffsetOfExpr(OffsetOfExpr expr)
         public override AST.Expr VisitUnaryExprOrTypeTraitExpr(UnaryExprOrTypeTraitExpr expr)
         {
             var _expr = new AST.UnaryExprOrTypeTraitExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -994,7 +1022,9 @@ public override AST.Expr VisitUnaryExprOrTypeTraitExpr(UnaryExprOrTypeTraitExpr
         public override AST.Expr VisitArraySubscriptExpr(ArraySubscriptExpr expr)
         {
             var _expr = new AST.ArraySubscriptExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1022,7 +1052,9 @@ public override AST.Expr VisitArraySubscriptExpr(ArraySubscriptExpr expr)
         public override AST.Expr VisitCallExpr(CallExpr expr)
         {
             var _expr = new AST.CallExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1058,7 +1090,9 @@ public override AST.Expr VisitCallExpr(CallExpr expr)
         public override AST.Expr VisitMemberExpr(MemberExpr expr)
         {
             var _expr = new AST.MemberExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1094,7 +1128,9 @@ public override AST.Expr VisitMemberExpr(MemberExpr expr)
         public override AST.Expr VisitCompoundLiteralExpr(CompoundLiteralExpr expr)
         {
             var _expr = new AST.CompoundLiteralExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1120,7 +1156,9 @@ public override AST.Expr VisitCompoundLiteralExpr(CompoundLiteralExpr expr)
         public override AST.Expr VisitImplicitCastExpr(ImplicitCastExpr expr)
         {
             var _expr = new AST.ImplicitCastExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1151,7 +1189,9 @@ public override AST.Expr VisitImplicitCastExpr(ImplicitCastExpr expr)
         public override AST.Expr VisitCStyleCastExpr(CStyleCastExpr expr)
         {
             var _expr = new AST.CStyleCastExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1184,7 +1224,9 @@ public override AST.Expr VisitCStyleCastExpr(CStyleCastExpr expr)
         public override AST.Expr VisitBinaryOperator(BinaryOperator expr)
         {
             var _expr = new AST.BinaryOperator();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1226,7 +1268,9 @@ public override AST.Expr VisitBinaryOperator(BinaryOperator expr)
         public override AST.Expr VisitCompoundAssignOperator(CompoundAssignOperator expr)
         {
             var _expr = new AST.CompoundAssignOperator();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1270,7 +1314,9 @@ public override AST.Expr VisitCompoundAssignOperator(CompoundAssignOperator expr
         public override AST.Expr VisitConditionalOperator(ConditionalOperator expr)
         {
             var _expr = new AST.ConditionalOperator();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1300,7 +1346,9 @@ public override AST.Expr VisitConditionalOperator(ConditionalOperator expr)
         public override AST.Expr VisitBinaryConditionalOperator(BinaryConditionalOperator expr)
         {
             var _expr = new AST.BinaryConditionalOperator();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1330,7 +1378,9 @@ public override AST.Expr VisitBinaryConditionalOperator(BinaryConditionalOperato
         public override AST.Expr VisitAddrLabelExpr(AddrLabelExpr expr)
         {
             var _expr = new AST.AddrLabelExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1355,7 +1405,9 @@ public override AST.Expr VisitAddrLabelExpr(AddrLabelExpr expr)
         public override AST.Expr VisitStmtExpr(StmtExpr expr)
         {
             var _expr = new AST.StmtExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1381,7 +1433,9 @@ public override AST.Expr VisitStmtExpr(StmtExpr expr)
         public override AST.Expr VisitShuffleVectorExpr(ShuffleVectorExpr expr)
         {
             var _expr = new AST.ShuffleVectorExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1407,7 +1461,9 @@ public override AST.Expr VisitShuffleVectorExpr(ShuffleVectorExpr expr)
         public override AST.Expr VisitConvertVectorExpr(ConvertVectorExpr expr)
         {
             var _expr = new AST.ConvertVectorExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1433,7 +1489,9 @@ public override AST.Expr VisitConvertVectorExpr(ConvertVectorExpr expr)
         public override AST.Expr VisitChooseExpr(ChooseExpr expr)
         {
             var _expr = new AST.ChooseExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1464,7 +1522,9 @@ public override AST.Expr VisitChooseExpr(ChooseExpr expr)
         public override AST.Expr VisitGNUNullExpr(GNUNullExpr expr)
         {
             var _expr = new AST.GNUNullExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1488,7 +1548,9 @@ public override AST.Expr VisitGNUNullExpr(GNUNullExpr expr)
         public override AST.Expr VisitVAArgExpr(VAArgExpr expr)
         {
             var _expr = new AST.VAArgExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1515,7 +1577,9 @@ public override AST.Expr VisitVAArgExpr(VAArgExpr expr)
         public override AST.Expr VisitInitListExpr(InitListExpr expr)
         {
             var _expr = new AST.InitListExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1550,7 +1614,9 @@ public override AST.Expr VisitInitListExpr(InitListExpr expr)
         public override AST.Expr VisitDesignatedInitExpr(DesignatedInitExpr expr)
         {
             var _expr = new AST.DesignatedInitExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1579,7 +1645,9 @@ public override AST.Expr VisitDesignatedInitExpr(DesignatedInitExpr expr)
         public override AST.Expr VisitNoInitExpr(NoInitExpr expr)
         {
             var _expr = new AST.NoInitExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1602,7 +1670,9 @@ public override AST.Expr VisitNoInitExpr(NoInitExpr expr)
         public override AST.Expr VisitDesignatedInitUpdateExpr(DesignatedInitUpdateExpr expr)
         {
             var _expr = new AST.DesignatedInitUpdateExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1627,7 +1697,9 @@ public override AST.Expr VisitDesignatedInitUpdateExpr(DesignatedInitUpdateExpr
         public override AST.Expr VisitArrayInitLoopExpr(ArrayInitLoopExpr expr)
         {
             var _expr = new AST.ArrayInitLoopExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1652,7 +1724,9 @@ public override AST.Expr VisitArrayInitLoopExpr(ArrayInitLoopExpr expr)
         public override AST.Expr VisitArrayInitIndexExpr(ArrayInitIndexExpr expr)
         {
             var _expr = new AST.ArrayInitIndexExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1675,7 +1749,9 @@ public override AST.Expr VisitArrayInitIndexExpr(ArrayInitIndexExpr expr)
         public override AST.Expr VisitImplicitValueInitExpr(ImplicitValueInitExpr expr)
         {
             var _expr = new AST.ImplicitValueInitExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1698,7 +1774,9 @@ public override AST.Expr VisitImplicitValueInitExpr(ImplicitValueInitExpr expr)
         public override AST.Expr VisitParenListExpr(ParenListExpr expr)
         {
             var _expr = new AST.ParenListExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1724,7 +1802,9 @@ public override AST.Expr VisitParenListExpr(ParenListExpr expr)
         public override AST.Expr VisitGenericSelectionExpr(GenericSelectionExpr expr)
         {
             var _expr = new AST.GenericSelectionExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1755,7 +1835,9 @@ public override AST.Expr VisitGenericSelectionExpr(GenericSelectionExpr expr)
         public override AST.Expr VisitExtVectorElementExpr(ExtVectorElementExpr expr)
         {
             var _expr = new AST.ExtVectorElementExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1783,7 +1865,9 @@ public override AST.Expr VisitExtVectorElementExpr(ExtVectorElementExpr expr)
         public override AST.Expr VisitBlockExpr(BlockExpr expr)
         {
             var _expr = new AST.BlockExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1808,7 +1892,9 @@ public override AST.Expr VisitBlockExpr(BlockExpr expr)
         public override AST.Expr VisitAsTypeExpr(AsTypeExpr expr)
         {
             var _expr = new AST.AsTypeExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1834,7 +1920,9 @@ public override AST.Expr VisitAsTypeExpr(AsTypeExpr expr)
         public override AST.Expr VisitPseudoObjectExpr(PseudoObjectExpr expr)
         {
             var _expr = new AST.PseudoObjectExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1861,7 +1949,9 @@ public override AST.Expr VisitPseudoObjectExpr(PseudoObjectExpr expr)
         public override AST.Expr VisitAtomicExpr(AtomicExpr expr)
         {
             var _expr = new AST.AtomicExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1899,7 +1989,9 @@ public override AST.Expr VisitAtomicExpr(AtomicExpr expr)
         public override AST.Expr VisitTypoExpr(TypoExpr expr)
         {
             var _expr = new AST.TypoExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1922,7 +2014,9 @@ public override AST.Expr VisitTypoExpr(TypoExpr expr)
         public override AST.Expr VisitCXXOperatorCallExpr(CXXOperatorCallExpr expr)
         {
             var _expr = new AST.CXXOperatorCallExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -1963,7 +2057,9 @@ public override AST.Expr VisitCXXOperatorCallExpr(CXXOperatorCallExpr expr)
         public override AST.Expr VisitCXXMemberCallExpr(CXXMemberCallExpr expr)
         {
             var _expr = new AST.CXXMemberCallExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2001,7 +2097,9 @@ public override AST.Expr VisitCXXMemberCallExpr(CXXMemberCallExpr expr)
         public override AST.Expr VisitCUDAKernelCallExpr(CUDAKernelCallExpr expr)
         {
             var _expr = new AST.CUDAKernelCallExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2038,7 +2136,9 @@ public override AST.Expr VisitCUDAKernelCallExpr(CUDAKernelCallExpr expr)
         public override AST.Expr VisitCXXStaticCastExpr(CXXStaticCastExpr expr)
         {
             var _expr = new AST.CXXStaticCastExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2073,7 +2173,9 @@ public override AST.Expr VisitCXXStaticCastExpr(CXXStaticCastExpr expr)
         public override AST.Expr VisitCXXDynamicCastExpr(CXXDynamicCastExpr expr)
         {
             var _expr = new AST.CXXDynamicCastExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2109,7 +2211,9 @@ public override AST.Expr VisitCXXDynamicCastExpr(CXXDynamicCastExpr expr)
         public override AST.Expr VisitCXXReinterpretCastExpr(CXXReinterpretCastExpr expr)
         {
             var _expr = new AST.CXXReinterpretCastExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2144,7 +2248,9 @@ public override AST.Expr VisitCXXReinterpretCastExpr(CXXReinterpretCastExpr expr
         public override AST.Expr VisitCXXConstCastExpr(CXXConstCastExpr expr)
         {
             var _expr = new AST.CXXConstCastExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2179,7 +2285,9 @@ public override AST.Expr VisitCXXConstCastExpr(CXXConstCastExpr expr)
         public override AST.Expr VisitUserDefinedLiteral(UserDefinedLiteral expr)
         {
             var _expr = new AST.UserDefinedLiteral();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2218,7 +2326,9 @@ public override AST.Expr VisitUserDefinedLiteral(UserDefinedLiteral expr)
         public override AST.Expr VisitCXXBoolLiteralExpr(CXXBoolLiteralExpr expr)
         {
             var _expr = new AST.CXXBoolLiteralExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2243,7 +2353,9 @@ public override AST.Expr VisitCXXBoolLiteralExpr(CXXBoolLiteralExpr expr)
         public override AST.Expr VisitCXXNullPtrLiteralExpr(CXXNullPtrLiteralExpr expr)
         {
             var _expr = new AST.CXXNullPtrLiteralExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2267,7 +2379,9 @@ public override AST.Expr VisitCXXNullPtrLiteralExpr(CXXNullPtrLiteralExpr expr)
         public override AST.Expr VisitCXXStdInitializerListExpr(CXXStdInitializerListExpr expr)
         {
             var _expr = new AST.CXXStdInitializerListExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2291,7 +2405,9 @@ public override AST.Expr VisitCXXStdInitializerListExpr(CXXStdInitializerListExp
         public override AST.Expr VisitCXXTypeidExpr(CXXTypeidExpr expr)
         {
             var _expr = new AST.CXXTypeidExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2317,7 +2433,9 @@ public override AST.Expr VisitCXXTypeidExpr(CXXTypeidExpr expr)
         public override AST.Expr VisitMSPropertyRefExpr(MSPropertyRefExpr expr)
         {
             var _expr = new AST.MSPropertyRefExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2344,7 +2462,9 @@ public override AST.Expr VisitMSPropertyRefExpr(MSPropertyRefExpr expr)
         public override AST.Expr VisitMSPropertySubscriptExpr(MSPropertySubscriptExpr expr)
         {
             var _expr = new AST.MSPropertySubscriptExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2370,7 +2490,9 @@ public override AST.Expr VisitMSPropertySubscriptExpr(MSPropertySubscriptExpr ex
         public override AST.Expr VisitCXXUuidofExpr(CXXUuidofExpr expr)
         {
             var _expr = new AST.CXXUuidofExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2396,7 +2518,9 @@ public override AST.Expr VisitCXXUuidofExpr(CXXUuidofExpr expr)
         public override AST.Expr VisitCXXThisExpr(CXXThisExpr expr)
         {
             var _expr = new AST.CXXThisExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2421,7 +2545,9 @@ public override AST.Expr VisitCXXThisExpr(CXXThisExpr expr)
         public override AST.Expr VisitCXXThrowExpr(CXXThrowExpr expr)
         {
             var _expr = new AST.CXXThrowExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2447,7 +2573,9 @@ public override AST.Expr VisitCXXThrowExpr(CXXThrowExpr expr)
         public override AST.Expr VisitCXXDefaultArgExpr(CXXDefaultArgExpr expr)
         {
             var _expr = new AST.CXXDefaultArgExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2472,7 +2600,9 @@ public override AST.Expr VisitCXXDefaultArgExpr(CXXDefaultArgExpr expr)
         public override AST.Expr VisitCXXDefaultInitExpr(CXXDefaultInitExpr expr)
         {
             var _expr = new AST.CXXDefaultInitExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2497,7 +2627,9 @@ public override AST.Expr VisitCXXDefaultInitExpr(CXXDefaultInitExpr expr)
         public override AST.Expr VisitCXXBindTemporaryExpr(CXXBindTemporaryExpr expr)
         {
             var _expr = new AST.CXXBindTemporaryExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2521,7 +2653,9 @@ public override AST.Expr VisitCXXBindTemporaryExpr(CXXBindTemporaryExpr expr)
         public override AST.Expr VisitCXXConstructExpr(CXXConstructExpr expr)
         {
             var _expr = new AST.CXXConstructExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2557,7 +2691,9 @@ public override AST.Expr VisitCXXConstructExpr(CXXConstructExpr expr)
         public override AST.Expr VisitCXXInheritedCtorInitExpr(CXXInheritedCtorInitExpr expr)
         {
             var _expr = new AST.CXXInheritedCtorInitExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2583,7 +2719,9 @@ public override AST.Expr VisitCXXInheritedCtorInitExpr(CXXInheritedCtorInitExpr
         public override AST.Expr VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr expr)
         {
             var _expr = new AST.CXXFunctionalCastExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2617,7 +2755,9 @@ public override AST.Expr VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr expr)
         public override AST.Expr VisitCXXTemporaryObjectExpr(CXXTemporaryObjectExpr expr)
         {
             var _expr = new AST.CXXTemporaryObjectExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2653,7 +2793,9 @@ public override AST.Expr VisitCXXTemporaryObjectExpr(CXXTemporaryObjectExpr expr
         public override AST.Expr VisitLambdaExpr(LambdaExpr expr)
         {
             var _expr = new AST.LambdaExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2690,7 +2832,9 @@ public override AST.Expr VisitLambdaExpr(LambdaExpr expr)
         public override AST.Expr VisitCXXScalarValueInitExpr(CXXScalarValueInitExpr expr)
         {
             var _expr = new AST.CXXScalarValueInitExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2714,7 +2858,9 @@ public override AST.Expr VisitCXXScalarValueInitExpr(CXXScalarValueInitExpr expr
         public override AST.Expr VisitCXXNewExpr(CXXNewExpr expr)
         {
             var _expr = new AST.CXXNewExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2756,7 +2902,9 @@ public override AST.Expr VisitCXXNewExpr(CXXNewExpr expr)
         public override AST.Expr VisitCXXDeleteExpr(CXXDeleteExpr expr)
         {
             var _expr = new AST.CXXDeleteExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2785,7 +2933,9 @@ public override AST.Expr VisitCXXDeleteExpr(CXXDeleteExpr expr)
         public override AST.Expr VisitCXXPseudoDestructorExpr(CXXPseudoDestructorExpr expr)
         {
             var _expr = new AST.CXXPseudoDestructorExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2816,7 +2966,9 @@ public override AST.Expr VisitCXXPseudoDestructorExpr(CXXPseudoDestructorExpr ex
         public override AST.Expr VisitTypeTraitExpr(TypeTraitExpr expr)
         {
             var _expr = new AST.TypeTraitExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2841,7 +2993,9 @@ public override AST.Expr VisitTypeTraitExpr(TypeTraitExpr expr)
         public override AST.Expr VisitArrayTypeTraitExpr(ArrayTypeTraitExpr expr)
         {
             var _expr = new AST.ArrayTypeTraitExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2867,7 +3021,9 @@ public override AST.Expr VisitArrayTypeTraitExpr(ArrayTypeTraitExpr expr)
         public override AST.Expr VisitExpressionTraitExpr(ExpressionTraitExpr expr)
         {
             var _expr = new AST.ExpressionTraitExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2892,7 +3048,9 @@ public override AST.Expr VisitExpressionTraitExpr(ExpressionTraitExpr expr)
         public override AST.Expr VisitUnresolvedLookupExpr(UnresolvedLookupExpr expr)
         {
             var _expr = new AST.UnresolvedLookupExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2925,7 +3083,9 @@ public override AST.Expr VisitUnresolvedLookupExpr(UnresolvedLookupExpr expr)
         public override AST.Expr VisitDependentScopeDeclRefExpr(DependentScopeDeclRefExpr expr)
         {
             var _expr = new AST.DependentScopeDeclRefExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2955,7 +3115,9 @@ public override AST.Expr VisitDependentScopeDeclRefExpr(DependentScopeDeclRefExp
         public override AST.Expr VisitExprWithCleanups(ExprWithCleanups expr)
         {
             var _expr = new AST.ExprWithCleanups();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -2981,7 +3143,9 @@ public override AST.Expr VisitExprWithCleanups(ExprWithCleanups expr)
         public override AST.Expr VisitCXXUnresolvedConstructExpr(CXXUnresolvedConstructExpr expr)
         {
             var _expr = new AST.CXXUnresolvedConstructExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -3014,7 +3178,9 @@ public override AST.Expr VisitCXXUnresolvedConstructExpr(CXXUnresolvedConstructE
         public override AST.Expr VisitCXXDependentScopeMemberExpr(CXXDependentScopeMemberExpr expr)
         {
             var _expr = new AST.CXXDependentScopeMemberExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -3050,7 +3216,9 @@ public override AST.Expr VisitCXXDependentScopeMemberExpr(CXXDependentScopeMembe
         public override AST.Expr VisitUnresolvedMemberExpr(UnresolvedMemberExpr expr)
         {
             var _expr = new AST.UnresolvedMemberExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -3088,7 +3256,9 @@ public override AST.Expr VisitUnresolvedMemberExpr(UnresolvedMemberExpr expr)
         public override AST.Expr VisitCXXNoexceptExpr(CXXNoexceptExpr expr)
         {
             var _expr = new AST.CXXNoexceptExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -3113,7 +3283,9 @@ public override AST.Expr VisitCXXNoexceptExpr(CXXNoexceptExpr expr)
         public override AST.Expr VisitPackExpansionExpr(PackExpansionExpr expr)
         {
             var _expr = new AST.PackExpansionExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -3138,7 +3310,9 @@ public override AST.Expr VisitPackExpansionExpr(PackExpansionExpr expr)
         public override AST.Expr VisitSizeOfPackExpr(SizeOfPackExpr expr)
         {
             var _expr = new AST.SizeOfPackExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -3167,7 +3341,9 @@ public override AST.Expr VisitSizeOfPackExpr(SizeOfPackExpr expr)
         public override AST.Expr VisitSubstNonTypeTemplateParmExpr(SubstNonTypeTemplateParmExpr expr)
         {
             var _expr = new AST.SubstNonTypeTemplateParmExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -3192,7 +3368,9 @@ public override AST.Expr VisitSubstNonTypeTemplateParmExpr(SubstNonTypeTemplateP
         public override AST.Expr VisitSubstNonTypeTemplateParmPackExpr(SubstNonTypeTemplateParmPackExpr expr)
         {
             var _expr = new AST.SubstNonTypeTemplateParmPackExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -3217,7 +3395,9 @@ public override AST.Expr VisitSubstNonTypeTemplateParmPackExpr(SubstNonTypeTempl
         public override AST.Expr VisitFunctionParmPackExpr(FunctionParmPackExpr expr)
         {
             var _expr = new AST.FunctionParmPackExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -3242,7 +3422,9 @@ public override AST.Expr VisitFunctionParmPackExpr(FunctionParmPackExpr expr)
         public override AST.Expr VisitMaterializeTemporaryExpr(MaterializeTemporaryExpr expr)
         {
             var _expr = new AST.MaterializeTemporaryExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -3269,7 +3451,9 @@ public override AST.Expr VisitMaterializeTemporaryExpr(MaterializeTemporaryExpr
         public override AST.Expr VisitCXXFoldExpr(CXXFoldExpr expr)
         {
             var _expr = new AST.CXXFoldExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -3300,7 +3484,9 @@ public override AST.Expr VisitCXXFoldExpr(CXXFoldExpr expr)
         public override AST.Expr VisitCoawaitExpr(CoawaitExpr expr)
         {
             var _expr = new AST.CoawaitExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -3331,7 +3517,9 @@ public override AST.Expr VisitCoawaitExpr(CoawaitExpr expr)
         public override AST.Expr VisitDependentCoawaitExpr(DependentCoawaitExpr expr)
         {
             var _expr = new AST.DependentCoawaitExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
@@ -3357,7 +3545,9 @@ public override AST.Expr VisitDependentCoawaitExpr(DependentCoawaitExpr expr)
         public override AST.Expr VisitCoyieldExpr(CoyieldExpr expr)
         {
             var _expr = new AST.CoyieldExpr();
+            _expr.stmtClass = (AST.Stmt.StmtClass) expr.stmtClass;
             _expr.SourceRange = VisitSourceRange(expr.SourceRange);
+            _expr.BeginLoc = VisitSourceLocation(expr.BeginLoc);
             _expr.EndLoc = VisitSourceLocation(expr.EndLoc);
             _expr.StripLabelLikeStatements = VisitStatement(expr.StripLabelLikeStatements) as AST.Stmt;
             _expr.Type = VisitQualifiedType(expr.Type);
diff --git a/src/Parser/ASTConverter.Stmt.cs b/src/Parser/ASTConverter.Stmt.cs
index 7a1a3be73c..b363aea10e 100644
--- a/src/Parser/ASTConverter.Stmt.cs
+++ b/src/Parser/ASTConverter.Stmt.cs
@@ -51,635 +51,635 @@ public virtual TRet Visit(Parser.AST.Stmt stmt)
             if (stmt == null)
                 return default(TRet);
 
-            switch(stmt.StmtClass)
+            switch(stmt.stmtClass)
             {
-                case StmtClass.GCCAsmStmt:
+                case Stmt.StmtClass.GCCAsmStmt:
                 {
                     var _stmt = GCCAsmStmt.__CreateInstance(stmt.__Instance);
                     return VisitGCCAsmStmt(_stmt);
                 }
-                case StmtClass.MSAsmStmt:
+                case Stmt.StmtClass.MSAsmStmt:
                 {
                     var _stmt = MSAsmStmt.__CreateInstance(stmt.__Instance);
                     return VisitMSAsmStmt(_stmt);
                 }
-                case StmtClass.AttributedStmt:
+                case Stmt.StmtClass.AttributedStmt:
                 {
                     var _stmt = AttributedStmt.__CreateInstance(stmt.__Instance);
                     return VisitAttributedStmt(_stmt);
                 }
-                case StmtClass.BreakStmt:
+                case Stmt.StmtClass.BreakStmt:
                 {
                     var _stmt = BreakStmt.__CreateInstance(stmt.__Instance);
                     return VisitBreakStmt(_stmt);
                 }
-                case StmtClass.CXXCatchStmt:
+                case Stmt.StmtClass.CXXCatchStmt:
                 {
                     var _stmt = CXXCatchStmt.__CreateInstance(stmt.__Instance);
                     return VisitCXXCatchStmt(_stmt);
                 }
-                case StmtClass.CXXForRangeStmt:
+                case Stmt.StmtClass.CXXForRangeStmt:
                 {
                     var _stmt = CXXForRangeStmt.__CreateInstance(stmt.__Instance);
                     return VisitCXXForRangeStmt(_stmt);
                 }
-                case StmtClass.CXXTryStmt:
+                case Stmt.StmtClass.CXXTryStmt:
                 {
                     var _stmt = CXXTryStmt.__CreateInstance(stmt.__Instance);
                     return VisitCXXTryStmt(_stmt);
                 }
-                case StmtClass.CapturedStmt:
+                case Stmt.StmtClass.CapturedStmt:
                 {
                     var _stmt = CapturedStmt.__CreateInstance(stmt.__Instance);
                     return VisitCapturedStmt(_stmt);
                 }
-                case StmtClass.CompoundStmt:
+                case Stmt.StmtClass.CompoundStmt:
                 {
                     var _stmt = CompoundStmt.__CreateInstance(stmt.__Instance);
                     return VisitCompoundStmt(_stmt);
                 }
-                case StmtClass.ContinueStmt:
+                case Stmt.StmtClass.ContinueStmt:
                 {
                     var _stmt = ContinueStmt.__CreateInstance(stmt.__Instance);
                     return VisitContinueStmt(_stmt);
                 }
-                case StmtClass.CoreturnStmt:
+                case Stmt.StmtClass.CoreturnStmt:
                 {
                     var _stmt = CoreturnStmt.__CreateInstance(stmt.__Instance);
                     return VisitCoreturnStmt(_stmt);
                 }
-                case StmtClass.CoroutineBodyStmt:
+                case Stmt.StmtClass.CoroutineBodyStmt:
                 {
                     var _stmt = CoroutineBodyStmt.__CreateInstance(stmt.__Instance);
                     return VisitCoroutineBodyStmt(_stmt);
                 }
-                case StmtClass.DeclStmt:
+                case Stmt.StmtClass.DeclStmt:
                 {
                     var _stmt = DeclStmt.__CreateInstance(stmt.__Instance);
                     return VisitDeclStmt(_stmt);
                 }
-                case StmtClass.DoStmt:
+                case Stmt.StmtClass.DoStmt:
                 {
                     var _stmt = DoStmt.__CreateInstance(stmt.__Instance);
                     return VisitDoStmt(_stmt);
                 }
-                case StmtClass.BinaryConditionalOperator:
+                case Stmt.StmtClass.BinaryConditionalOperator:
                 {
                     var _stmt = BinaryConditionalOperator.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ConditionalOperator:
+                case Stmt.StmtClass.ConditionalOperator:
                 {
                     var _stmt = ConditionalOperator.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.AddrLabelExpr:
+                case Stmt.StmtClass.AddrLabelExpr:
                 {
                     var _stmt = AddrLabelExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ArrayInitIndexExpr:
+                case Stmt.StmtClass.ArrayInitIndexExpr:
                 {
                     var _stmt = ArrayInitIndexExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ArrayInitLoopExpr:
+                case Stmt.StmtClass.ArrayInitLoopExpr:
                 {
                     var _stmt = ArrayInitLoopExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ArraySubscriptExpr:
+                case Stmt.StmtClass.ArraySubscriptExpr:
                 {
                     var _stmt = ArraySubscriptExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ArrayTypeTraitExpr:
+                case Stmt.StmtClass.ArrayTypeTraitExpr:
                 {
                     var _stmt = ArrayTypeTraitExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.AsTypeExpr:
+                case Stmt.StmtClass.AsTypeExpr:
                 {
                     var _stmt = AsTypeExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.AtomicExpr:
+                case Stmt.StmtClass.AtomicExpr:
                 {
                     var _stmt = AtomicExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.BinaryOperator:
+                case Stmt.StmtClass.BinaryOperator:
                 {
                     var _stmt = BinaryOperator.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CompoundAssignOperator:
+                case Stmt.StmtClass.CompoundAssignOperator:
                 {
                     var _stmt = CompoundAssignOperator.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.BlockExpr:
+                case Stmt.StmtClass.BlockExpr:
                 {
                     var _stmt = BlockExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXBindTemporaryExpr:
+                case Stmt.StmtClass.CXXBindTemporaryExpr:
                 {
                     var _stmt = CXXBindTemporaryExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXBoolLiteralExpr:
+                case Stmt.StmtClass.CXXBoolLiteralExpr:
                 {
                     var _stmt = CXXBoolLiteralExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXConstructExpr:
+                case Stmt.StmtClass.CXXConstructExpr:
                 {
                     var _stmt = CXXConstructExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXTemporaryObjectExpr:
+                case Stmt.StmtClass.CXXTemporaryObjectExpr:
                 {
                     var _stmt = CXXTemporaryObjectExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXDefaultArgExpr:
+                case Stmt.StmtClass.CXXDefaultArgExpr:
                 {
                     var _stmt = CXXDefaultArgExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXDefaultInitExpr:
+                case Stmt.StmtClass.CXXDefaultInitExpr:
                 {
                     var _stmt = CXXDefaultInitExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXDeleteExpr:
+                case Stmt.StmtClass.CXXDeleteExpr:
                 {
                     var _stmt = CXXDeleteExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXDependentScopeMemberExpr:
+                case Stmt.StmtClass.CXXDependentScopeMemberExpr:
                 {
                     var _stmt = CXXDependentScopeMemberExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXFoldExpr:
+                case Stmt.StmtClass.CXXFoldExpr:
                 {
                     var _stmt = CXXFoldExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXInheritedCtorInitExpr:
+                case Stmt.StmtClass.CXXInheritedCtorInitExpr:
                 {
                     var _stmt = CXXInheritedCtorInitExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXNewExpr:
+                case Stmt.StmtClass.CXXNewExpr:
                 {
                     var _stmt = CXXNewExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXNoexceptExpr:
+                case Stmt.StmtClass.CXXNoexceptExpr:
                 {
                     var _stmt = CXXNoexceptExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXNullPtrLiteralExpr:
+                case Stmt.StmtClass.CXXNullPtrLiteralExpr:
                 {
                     var _stmt = CXXNullPtrLiteralExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXPseudoDestructorExpr:
+                case Stmt.StmtClass.CXXPseudoDestructorExpr:
                 {
                     var _stmt = CXXPseudoDestructorExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXScalarValueInitExpr:
+                case Stmt.StmtClass.CXXScalarValueInitExpr:
                 {
                     var _stmt = CXXScalarValueInitExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXStdInitializerListExpr:
+                case Stmt.StmtClass.CXXStdInitializerListExpr:
                 {
                     var _stmt = CXXStdInitializerListExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXThisExpr:
+                case Stmt.StmtClass.CXXThisExpr:
                 {
                     var _stmt = CXXThisExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXThrowExpr:
+                case Stmt.StmtClass.CXXThrowExpr:
                 {
                     var _stmt = CXXThrowExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXTypeidExpr:
+                case Stmt.StmtClass.CXXTypeidExpr:
                 {
                     var _stmt = CXXTypeidExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXUnresolvedConstructExpr:
+                case Stmt.StmtClass.CXXUnresolvedConstructExpr:
                 {
                     var _stmt = CXXUnresolvedConstructExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXUuidofExpr:
+                case Stmt.StmtClass.CXXUuidofExpr:
                 {
                     var _stmt = CXXUuidofExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CallExpr:
+                case Stmt.StmtClass.CallExpr:
                 {
                     var _stmt = CallExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CUDAKernelCallExpr:
+                case Stmt.StmtClass.CUDAKernelCallExpr:
                 {
                     var _stmt = CUDAKernelCallExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXMemberCallExpr:
+                case Stmt.StmtClass.CXXMemberCallExpr:
                 {
                     var _stmt = CXXMemberCallExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXOperatorCallExpr:
+                case Stmt.StmtClass.CXXOperatorCallExpr:
                 {
                     var _stmt = CXXOperatorCallExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.UserDefinedLiteral:
+                case Stmt.StmtClass.UserDefinedLiteral:
                 {
                     var _stmt = UserDefinedLiteral.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CStyleCastExpr:
+                case Stmt.StmtClass.CStyleCastExpr:
                 {
                     var _stmt = CStyleCastExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXFunctionalCastExpr:
+                case Stmt.StmtClass.CXXFunctionalCastExpr:
                 {
                     var _stmt = CXXFunctionalCastExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXConstCastExpr:
+                case Stmt.StmtClass.CXXConstCastExpr:
                 {
                     var _stmt = CXXConstCastExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXDynamicCastExpr:
+                case Stmt.StmtClass.CXXDynamicCastExpr:
                 {
                     var _stmt = CXXDynamicCastExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXReinterpretCastExpr:
+                case Stmt.StmtClass.CXXReinterpretCastExpr:
                 {
                     var _stmt = CXXReinterpretCastExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CXXStaticCastExpr:
+                case Stmt.StmtClass.CXXStaticCastExpr:
                 {
                     var _stmt = CXXStaticCastExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ImplicitCastExpr:
+                case Stmt.StmtClass.ImplicitCastExpr:
                 {
                     var _stmt = ImplicitCastExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CharacterLiteral:
+                case Stmt.StmtClass.CharacterLiteral:
                 {
                     var _stmt = CharacterLiteral.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ChooseExpr:
+                case Stmt.StmtClass.ChooseExpr:
                 {
                     var _stmt = ChooseExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CompoundLiteralExpr:
+                case Stmt.StmtClass.CompoundLiteralExpr:
                 {
                     var _stmt = CompoundLiteralExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ConvertVectorExpr:
+                case Stmt.StmtClass.ConvertVectorExpr:
                 {
                     var _stmt = ConvertVectorExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CoawaitExpr:
+                case Stmt.StmtClass.CoawaitExpr:
                 {
                     var _stmt = CoawaitExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.CoyieldExpr:
+                case Stmt.StmtClass.CoyieldExpr:
                 {
                     var _stmt = CoyieldExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.DeclRefExpr:
+                case Stmt.StmtClass.DeclRefExpr:
                 {
                     var _stmt = DeclRefExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.DependentCoawaitExpr:
+                case Stmt.StmtClass.DependentCoawaitExpr:
                 {
                     var _stmt = DependentCoawaitExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.DependentScopeDeclRefExpr:
+                case Stmt.StmtClass.DependentScopeDeclRefExpr:
                 {
                     var _stmt = DependentScopeDeclRefExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.DesignatedInitExpr:
+                case Stmt.StmtClass.DesignatedInitExpr:
                 {
                     var _stmt = DesignatedInitExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.DesignatedInitUpdateExpr:
+                case Stmt.StmtClass.DesignatedInitUpdateExpr:
                 {
                     var _stmt = DesignatedInitUpdateExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ExpressionTraitExpr:
+                case Stmt.StmtClass.ExpressionTraitExpr:
                 {
                     var _stmt = ExpressionTraitExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ExtVectorElementExpr:
+                case Stmt.StmtClass.ExtVectorElementExpr:
                 {
                     var _stmt = ExtVectorElementExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.FixedPointLiteral:
+                case Stmt.StmtClass.FixedPointLiteral:
                 {
                     var _stmt = FixedPointLiteral.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.FloatingLiteral:
+                case Stmt.StmtClass.FloatingLiteral:
                 {
                     var _stmt = FloatingLiteral.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ConstantExpr:
+                case Stmt.StmtClass.ConstantExpr:
                 {
                     var _stmt = ConstantExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ExprWithCleanups:
+                case Stmt.StmtClass.ExprWithCleanups:
                 {
                     var _stmt = ExprWithCleanups.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.FunctionParmPackExpr:
+                case Stmt.StmtClass.FunctionParmPackExpr:
                 {
                     var _stmt = FunctionParmPackExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.GNUNullExpr:
+                case Stmt.StmtClass.GNUNullExpr:
                 {
                     var _stmt = GNUNullExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.GenericSelectionExpr:
+                case Stmt.StmtClass.GenericSelectionExpr:
                 {
                     var _stmt = GenericSelectionExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ImaginaryLiteral:
+                case Stmt.StmtClass.ImaginaryLiteral:
                 {
                     var _stmt = ImaginaryLiteral.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ImplicitValueInitExpr:
+                case Stmt.StmtClass.ImplicitValueInitExpr:
                 {
                     var _stmt = ImplicitValueInitExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.InitListExpr:
+                case Stmt.StmtClass.InitListExpr:
                 {
                     var _stmt = InitListExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.IntegerLiteral:
+                case Stmt.StmtClass.IntegerLiteral:
                 {
                     var _stmt = IntegerLiteral.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.LambdaExpr:
+                case Stmt.StmtClass.LambdaExpr:
                 {
                     var _stmt = LambdaExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.MSPropertyRefExpr:
+                case Stmt.StmtClass.MSPropertyRefExpr:
                 {
                     var _stmt = MSPropertyRefExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.MSPropertySubscriptExpr:
+                case Stmt.StmtClass.MSPropertySubscriptExpr:
                 {
                     var _stmt = MSPropertySubscriptExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.MaterializeTemporaryExpr:
+                case Stmt.StmtClass.MaterializeTemporaryExpr:
                 {
                     var _stmt = MaterializeTemporaryExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.MemberExpr:
+                case Stmt.StmtClass.MemberExpr:
                 {
                     var _stmt = MemberExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.NoInitExpr:
+                case Stmt.StmtClass.NoInitExpr:
                 {
                     var _stmt = NoInitExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.OffsetOfExpr:
+                case Stmt.StmtClass.OffsetOfExpr:
                 {
                     var _stmt = OffsetOfExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.OpaqueValueExpr:
+                case Stmt.StmtClass.OpaqueValueExpr:
                 {
                     var _stmt = OpaqueValueExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.UnresolvedLookupExpr:
+                case Stmt.StmtClass.UnresolvedLookupExpr:
                 {
                     var _stmt = UnresolvedLookupExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.UnresolvedMemberExpr:
+                case Stmt.StmtClass.UnresolvedMemberExpr:
                 {
                     var _stmt = UnresolvedMemberExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.PackExpansionExpr:
+                case Stmt.StmtClass.PackExpansionExpr:
                 {
                     var _stmt = PackExpansionExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ParenExpr:
+                case Stmt.StmtClass.ParenExpr:
                 {
                     var _stmt = ParenExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ParenListExpr:
+                case Stmt.StmtClass.ParenListExpr:
                 {
                     var _stmt = ParenListExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.PredefinedExpr:
+                case Stmt.StmtClass.PredefinedExpr:
                 {
                     var _stmt = PredefinedExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.PseudoObjectExpr:
+                case Stmt.StmtClass.PseudoObjectExpr:
                 {
                     var _stmt = PseudoObjectExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ShuffleVectorExpr:
+                case Stmt.StmtClass.ShuffleVectorExpr:
                 {
                     var _stmt = ShuffleVectorExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.SizeOfPackExpr:
+                case Stmt.StmtClass.SizeOfPackExpr:
                 {
                     var _stmt = SizeOfPackExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.StmtExpr:
+                case Stmt.StmtClass.StmtExpr:
                 {
                     var _stmt = StmtExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.StringLiteral:
+                case Stmt.StmtClass.StringLiteral:
                 {
                     var _stmt = StringLiteral.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.SubstNonTypeTemplateParmExpr:
+                case Stmt.StmtClass.SubstNonTypeTemplateParmExpr:
                 {
                     var _stmt = SubstNonTypeTemplateParmExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.SubstNonTypeTemplateParmPackExpr:
+                case Stmt.StmtClass.SubstNonTypeTemplateParmPackExpr:
                 {
                     var _stmt = SubstNonTypeTemplateParmPackExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.TypeTraitExpr:
+                case Stmt.StmtClass.TypeTraitExpr:
                 {
                     var _stmt = TypeTraitExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.TypoExpr:
+                case Stmt.StmtClass.TypoExpr:
                 {
                     var _stmt = TypoExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.UnaryExprOrTypeTraitExpr:
+                case Stmt.StmtClass.UnaryExprOrTypeTraitExpr:
                 {
                     var _stmt = UnaryExprOrTypeTraitExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.UnaryOperator:
+                case Stmt.StmtClass.UnaryOperator:
                 {
                     var _stmt = UnaryOperator.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.VAArgExpr:
+                case Stmt.StmtClass.VAArgExpr:
                 {
                     var _stmt = VAArgExpr.__CreateInstance(stmt.__Instance);
                     return VisitExpression(_stmt as Expr) as TRet;
                 }
-                case StmtClass.ForStmt:
+                case Stmt.StmtClass.ForStmt:
                 {
                     var _stmt = ForStmt.__CreateInstance(stmt.__Instance);
                     return VisitForStmt(_stmt);
                 }
-                case StmtClass.GotoStmt:
+                case Stmt.StmtClass.GotoStmt:
                 {
                     var _stmt = GotoStmt.__CreateInstance(stmt.__Instance);
                     return VisitGotoStmt(_stmt);
                 }
-                case StmtClass.IfStmt:
+                case Stmt.StmtClass.IfStmt:
                 {
                     var _stmt = IfStmt.__CreateInstance(stmt.__Instance);
                     return VisitIfStmt(_stmt);
                 }
-                case StmtClass.IndirectGotoStmt:
+                case Stmt.StmtClass.IndirectGotoStmt:
                 {
                     var _stmt = IndirectGotoStmt.__CreateInstance(stmt.__Instance);
                     return VisitIndirectGotoStmt(_stmt);
                 }
-                case StmtClass.LabelStmt:
+                case Stmt.StmtClass.LabelStmt:
                 {
                     var _stmt = LabelStmt.__CreateInstance(stmt.__Instance);
                     return VisitLabelStmt(_stmt);
                 }
-                case StmtClass.MSDependentExistsStmt:
+                case Stmt.StmtClass.MSDependentExistsStmt:
                 {
                     var _stmt = MSDependentExistsStmt.__CreateInstance(stmt.__Instance);
                     return VisitMSDependentExistsStmt(_stmt);
                 }
-                case StmtClass.NullStmt:
+                case Stmt.StmtClass.NullStmt:
                 {
                     var _stmt = NullStmt.__CreateInstance(stmt.__Instance);
                     return VisitNullStmt(_stmt);
                 }
-                case StmtClass.ReturnStmt:
+                case Stmt.StmtClass.ReturnStmt:
                 {
                     var _stmt = ReturnStmt.__CreateInstance(stmt.__Instance);
                     return VisitReturnStmt(_stmt);
                 }
-                case StmtClass.SEHExceptStmt:
+                case Stmt.StmtClass.SEHExceptStmt:
                 {
                     var _stmt = SEHExceptStmt.__CreateInstance(stmt.__Instance);
                     return VisitSEHExceptStmt(_stmt);
                 }
-                case StmtClass.SEHFinallyStmt:
+                case Stmt.StmtClass.SEHFinallyStmt:
                 {
                     var _stmt = SEHFinallyStmt.__CreateInstance(stmt.__Instance);
                     return VisitSEHFinallyStmt(_stmt);
                 }
-                case StmtClass.SEHLeaveStmt:
+                case Stmt.StmtClass.SEHLeaveStmt:
                 {
                     var _stmt = SEHLeaveStmt.__CreateInstance(stmt.__Instance);
                     return VisitSEHLeaveStmt(_stmt);
                 }
-                case StmtClass.SEHTryStmt:
+                case Stmt.StmtClass.SEHTryStmt:
                 {
                     var _stmt = SEHTryStmt.__CreateInstance(stmt.__Instance);
                     return VisitSEHTryStmt(_stmt);
                 }
-                case StmtClass.CaseStmt:
+                case Stmt.StmtClass.CaseStmt:
                 {
                     var _stmt = CaseStmt.__CreateInstance(stmt.__Instance);
                     return VisitCaseStmt(_stmt);
                 }
-                case StmtClass.DefaultStmt:
+                case Stmt.StmtClass.DefaultStmt:
                 {
                     var _stmt = DefaultStmt.__CreateInstance(stmt.__Instance);
                     return VisitDefaultStmt(_stmt);
                 }
-                case StmtClass.SwitchStmt:
+                case Stmt.StmtClass.SwitchStmt:
                 {
                     var _stmt = SwitchStmt.__CreateInstance(stmt.__Instance);
                     return VisitSwitchStmt(_stmt);
                 }
-                case StmtClass.WhileStmt:
+                case Stmt.StmtClass.WhileStmt:
                 {
                     var _stmt = WhileStmt.__CreateInstance(stmt.__Instance);
                     return VisitWhileStmt(_stmt);
                 }
                 default:
-                    throw new System.NotImplementedException(stmt.StmtClass.ToString());
+                    throw new System.NotImplementedException(stmt.stmtClass.ToString());
             }
         }
     }
@@ -689,7 +689,9 @@ public unsafe class StmtConverter : StmtVisitor<AST.Stmt>
         public override AST.Stmt VisitDeclStmt(DeclStmt stmt)
         {
             var _stmt = new AST.DeclStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.IsSingleDecl = stmt.IsSingleDecl;
@@ -705,7 +707,9 @@ public override AST.Stmt VisitDeclStmt(DeclStmt stmt)
         public override AST.Stmt VisitNullStmt(NullStmt stmt)
         {
             var _stmt = new AST.NullStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.SemiLoc = VisitSourceLocation(stmt.SemiLoc);
@@ -716,7 +720,9 @@ public override AST.Stmt VisitNullStmt(NullStmt stmt)
         public override AST.Stmt VisitCompoundStmt(CompoundStmt stmt)
         {
             var _stmt = new AST.CompoundStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.BodyEmpty = stmt.BodyEmpty;
@@ -736,7 +742,9 @@ public override AST.Stmt VisitCompoundStmt(CompoundStmt stmt)
         public override AST.Stmt VisitCaseStmt(CaseStmt stmt)
         {
             var _stmt = new AST.CaseStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.KeywordLoc = VisitSourceLocation(stmt.KeywordLoc);
@@ -753,7 +761,9 @@ public override AST.Stmt VisitCaseStmt(CaseStmt stmt)
         public override AST.Stmt VisitDefaultStmt(DefaultStmt stmt)
         {
             var _stmt = new AST.DefaultStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.KeywordLoc = VisitSourceLocation(stmt.KeywordLoc);
@@ -766,7 +776,9 @@ public override AST.Stmt VisitDefaultStmt(DefaultStmt stmt)
         public override AST.Stmt VisitLabelStmt(LabelStmt stmt)
         {
             var _stmt = new AST.LabelStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.IdentLoc = VisitSourceLocation(stmt.IdentLoc);
@@ -778,7 +790,9 @@ public override AST.Stmt VisitLabelStmt(LabelStmt stmt)
         public override AST.Stmt VisitAttributedStmt(AttributedStmt stmt)
         {
             var _stmt = new AST.AttributedStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.AttrLoc = VisitSourceLocation(stmt.AttrLoc);
@@ -789,7 +803,9 @@ public override AST.Stmt VisitAttributedStmt(AttributedStmt stmt)
         public override AST.Stmt VisitIfStmt(IfStmt stmt)
         {
             var _stmt = new AST.IfStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.Cond = VisitExpression(stmt.Cond) as AST.Expr;
@@ -810,7 +826,9 @@ public override AST.Stmt VisitIfStmt(IfStmt stmt)
         public override AST.Stmt VisitSwitchStmt(SwitchStmt stmt)
         {
             var _stmt = new AST.SwitchStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.Cond = VisitExpression(stmt.Cond) as AST.Expr;
@@ -827,7 +845,9 @@ public override AST.Stmt VisitSwitchStmt(SwitchStmt stmt)
         public override AST.Stmt VisitWhileStmt(WhileStmt stmt)
         {
             var _stmt = new AST.WhileStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.Cond = VisitExpression(stmt.Cond) as AST.Expr;
@@ -841,7 +861,9 @@ public override AST.Stmt VisitWhileStmt(WhileStmt stmt)
         public override AST.Stmt VisitDoStmt(DoStmt stmt)
         {
             var _stmt = new AST.DoStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.Cond = VisitExpression(stmt.Cond) as AST.Expr;
@@ -855,7 +877,9 @@ public override AST.Stmt VisitDoStmt(DoStmt stmt)
         public override AST.Stmt VisitForStmt(ForStmt stmt)
         {
             var _stmt = new AST.ForStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.Init = VisitStatement(stmt.Init) as AST.Stmt;
@@ -872,7 +896,9 @@ public override AST.Stmt VisitForStmt(ForStmt stmt)
         public override AST.Stmt VisitGotoStmt(GotoStmt stmt)
         {
             var _stmt = new AST.GotoStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.GotoLoc = VisitSourceLocation(stmt.GotoLoc);
@@ -883,7 +909,9 @@ public override AST.Stmt VisitGotoStmt(GotoStmt stmt)
         public override AST.Stmt VisitIndirectGotoStmt(IndirectGotoStmt stmt)
         {
             var _stmt = new AST.IndirectGotoStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.GotoLoc = VisitSourceLocation(stmt.GotoLoc);
@@ -895,7 +923,9 @@ public override AST.Stmt VisitIndirectGotoStmt(IndirectGotoStmt stmt)
         public override AST.Stmt VisitContinueStmt(ContinueStmt stmt)
         {
             var _stmt = new AST.ContinueStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.ContinueLoc = VisitSourceLocation(stmt.ContinueLoc);
@@ -905,7 +935,9 @@ public override AST.Stmt VisitContinueStmt(ContinueStmt stmt)
         public override AST.Stmt VisitBreakStmt(BreakStmt stmt)
         {
             var _stmt = new AST.BreakStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.BreakLoc = VisitSourceLocation(stmt.BreakLoc);
@@ -915,7 +947,9 @@ public override AST.Stmt VisitBreakStmt(BreakStmt stmt)
         public override AST.Stmt VisitReturnStmt(ReturnStmt stmt)
         {
             var _stmt = new AST.ReturnStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.RetValue = VisitExpression(stmt.RetValue) as AST.Expr;
@@ -926,7 +960,9 @@ public override AST.Stmt VisitReturnStmt(ReturnStmt stmt)
         public override AST.Stmt VisitGCCAsmStmt(GCCAsmStmt stmt)
         {
             var _stmt = new AST.GCCAsmStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.AsmLoc = VisitSourceLocation(stmt.AsmLoc);
@@ -953,7 +989,9 @@ public override AST.Stmt VisitGCCAsmStmt(GCCAsmStmt stmt)
         public override AST.Stmt VisitMSAsmStmt(MSAsmStmt stmt)
         {
             var _stmt = new AST.MSAsmStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.AsmLoc = VisitSourceLocation(stmt.AsmLoc);
@@ -983,7 +1021,9 @@ public override AST.Stmt VisitMSAsmStmt(MSAsmStmt stmt)
         public override AST.Stmt VisitSEHExceptStmt(SEHExceptStmt stmt)
         {
             var _stmt = new AST.SEHExceptStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.ExceptLoc = VisitSourceLocation(stmt.ExceptLoc);
@@ -995,7 +1035,9 @@ public override AST.Stmt VisitSEHExceptStmt(SEHExceptStmt stmt)
         public override AST.Stmt VisitSEHFinallyStmt(SEHFinallyStmt stmt)
         {
             var _stmt = new AST.SEHFinallyStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.FinallyLoc = VisitSourceLocation(stmt.FinallyLoc);
@@ -1006,7 +1048,9 @@ public override AST.Stmt VisitSEHFinallyStmt(SEHFinallyStmt stmt)
         public override AST.Stmt VisitSEHTryStmt(SEHTryStmt stmt)
         {
             var _stmt = new AST.SEHTryStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.TryLoc = VisitSourceLocation(stmt.TryLoc);
@@ -1021,7 +1065,9 @@ public override AST.Stmt VisitSEHTryStmt(SEHTryStmt stmt)
         public override AST.Stmt VisitSEHLeaveStmt(SEHLeaveStmt stmt)
         {
             var _stmt = new AST.SEHLeaveStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.LeaveLoc = VisitSourceLocation(stmt.LeaveLoc);
@@ -1031,7 +1077,9 @@ public override AST.Stmt VisitSEHLeaveStmt(SEHLeaveStmt stmt)
         public override AST.Stmt VisitCapturedStmt(CapturedStmt stmt)
         {
             var _stmt = new AST.CapturedStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.capturedStmt = VisitStatement(stmt.capturedStmt) as AST.Stmt;
@@ -1047,7 +1095,9 @@ public override AST.Stmt VisitCapturedStmt(CapturedStmt stmt)
         public override AST.Stmt VisitCXXCatchStmt(CXXCatchStmt stmt)
         {
             var _stmt = new AST.CXXCatchStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.CatchLoc = VisitSourceLocation(stmt.CatchLoc);
@@ -1059,7 +1109,9 @@ public override AST.Stmt VisitCXXCatchStmt(CXXCatchStmt stmt)
         public override AST.Stmt VisitCXXTryStmt(CXXTryStmt stmt)
         {
             var _stmt = new AST.CXXTryStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.TryLoc = VisitSourceLocation(stmt.TryLoc);
@@ -1071,7 +1123,9 @@ public override AST.Stmt VisitCXXTryStmt(CXXTryStmt stmt)
         public override AST.Stmt VisitCXXForRangeStmt(CXXForRangeStmt stmt)
         {
             var _stmt = new AST.CXXForRangeStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.Init = VisitStatement(stmt.Init) as AST.Stmt;
@@ -1093,7 +1147,9 @@ public override AST.Stmt VisitCXXForRangeStmt(CXXForRangeStmt stmt)
         public override AST.Stmt VisitMSDependentExistsStmt(MSDependentExistsStmt stmt)
         {
             var _stmt = new AST.MSDependentExistsStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.KeywordLoc = VisitSourceLocation(stmt.KeywordLoc);
@@ -1106,7 +1162,9 @@ public override AST.Stmt VisitMSDependentExistsStmt(MSDependentExistsStmt stmt)
         public override AST.Stmt VisitCoroutineBodyStmt(CoroutineBodyStmt stmt)
         {
             var _stmt = new AST.CoroutineBodyStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.HasDependentPromiseType = stmt.HasDependentPromiseType;
@@ -1128,7 +1186,9 @@ public override AST.Stmt VisitCoroutineBodyStmt(CoroutineBodyStmt stmt)
         public override AST.Stmt VisitCoreturnStmt(CoreturnStmt stmt)
         {
             var _stmt = new AST.CoreturnStmt();
+            _stmt.stmtClass = (AST.Stmt.StmtClass) stmt.stmtClass;
             _stmt.SourceRange = VisitSourceRange(stmt.SourceRange);
+            _stmt.BeginLoc = VisitSourceLocation(stmt.BeginLoc);
             _stmt.EndLoc = VisitSourceLocation(stmt.EndLoc);
             _stmt.StripLabelLikeStatements = VisitStatement(stmt.StripLabelLikeStatements) as AST.Stmt;
             _stmt.IsImplicit = stmt.IsImplicit;