diff --git a/src/CppParser/Bindings/CLI/AST.cpp b/src/CppParser/Bindings/CLI/AST.cpp
index c86c7afe..c82d5d04 100644
--- a/src/CppParser/Bindings/CLI/AST.cpp
+++ b/src/CppParser/Bindings/CLI/AST.cpp
@@ -250,6 +250,12 @@ CppSharp::Parser::AST::Parameter^ CppSharp::Parser::AST::FunctionType::getParame
     return gcnew CppSharp::Parser::AST::Parameter((::CppSharp::CppParser::AST::Parameter*)__ret);
 }
 
+void CppSharp::Parser::AST::FunctionType::addParameters(CppSharp::Parser::AST::Parameter^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::Parameter*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::FunctionType*)NativePtr)->addParameters(arg0);
+}
+
 unsigned int CppSharp::Parser::AST::FunctionType::ParametersCount::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::FunctionType*)NativePtr)->getParametersCount();
@@ -541,6 +547,12 @@ CppSharp::Parser::AST::TemplateArgument^ CppSharp::Parser::AST::TemplateSpeciali
     return gcnew CppSharp::Parser::AST::TemplateArgument((::CppSharp::CppParser::AST::TemplateArgument*)____ret);
 }
 
+void CppSharp::Parser::AST::TemplateSpecializationType::addArguments(CppSharp::Parser::AST::TemplateArgument^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::TemplateArgument*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::TemplateSpecializationType*)NativePtr)->addArguments(arg0);
+}
+
 unsigned int CppSharp::Parser::AST::TemplateSpecializationType::ArgumentsCount::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::TemplateSpecializationType*)NativePtr)->getArgumentsCount();
@@ -884,6 +896,11 @@ CppSharp::Parser::AST::VTableLayout::VTableLayout(System::IntPtr native)
     NativePtr = __native;
 }
 
+CppSharp::Parser::AST::VTableLayout::VTableLayout()
+{
+    NativePtr = new ::CppSharp::CppParser::AST::VTableLayout();
+}
+
 CppSharp::Parser::AST::VTableComponent^ CppSharp::Parser::AST::VTableLayout::getComponents(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::VTableLayout*)NativePtr)->getComponents(i);
@@ -891,9 +908,10 @@ CppSharp::Parser::AST::VTableComponent^ CppSharp::Parser::AST::VTableLayout::get
     return gcnew CppSharp::Parser::AST::VTableComponent((::CppSharp::CppParser::AST::VTableComponent*)____ret);
 }
 
-CppSharp::Parser::AST::VTableLayout::VTableLayout()
+void CppSharp::Parser::AST::VTableLayout::addComponents(CppSharp::Parser::AST::VTableComponent^ s)
 {
-    NativePtr = new ::CppSharp::CppParser::AST::VTableLayout();
+    auto &arg0 = *(::CppSharp::CppParser::AST::VTableComponent*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::VTableLayout*)NativePtr)->addComponents(arg0);
 }
 
 System::IntPtr CppSharp::Parser::AST::VTableLayout::__Instance::get()
@@ -1001,6 +1019,12 @@ CppSharp::Parser::AST::VFTableInfo^ CppSharp::Parser::AST::ClassLayout::getVFTab
     return gcnew CppSharp::Parser::AST::VFTableInfo((::CppSharp::CppParser::AST::VFTableInfo*)____ret);
 }
 
+void CppSharp::Parser::AST::ClassLayout::addVFTables(CppSharp::Parser::AST::VFTableInfo^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::VFTableInfo*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::ClassLayout*)NativePtr)->addVFTables(arg0);
+}
+
 System::IntPtr CppSharp::Parser::AST::ClassLayout::__Instance::get()
 {
     return System::IntPtr(NativePtr);
@@ -1111,6 +1135,12 @@ CppSharp::Parser::AST::PreprocessedEntity^ CppSharp::Parser::AST::Declaration::g
     return gcnew CppSharp::Parser::AST::PreprocessedEntity((::CppSharp::CppParser::AST::PreprocessedEntity*)__ret);
 }
 
+void CppSharp::Parser::AST::Declaration::addPreprocessedEntities(CppSharp::Parser::AST::PreprocessedEntity^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::PreprocessedEntity*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->addPreprocessedEntities(arg0);
+}
+
 System::IntPtr CppSharp::Parser::AST::Declaration::__Instance::get()
 {
     return System::IntPtr(NativePtr);
@@ -1380,6 +1410,12 @@ CppSharp::Parser::AST::Namespace^ CppSharp::Parser::AST::DeclarationContext::get
     return gcnew CppSharp::Parser::AST::Namespace((::CppSharp::CppParser::AST::Namespace*)__ret);
 }
 
+void CppSharp::Parser::AST::DeclarationContext::addNamespaces(CppSharp::Parser::AST::Namespace^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::Namespace*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->addNamespaces(arg0);
+}
+
 CppSharp::Parser::AST::Enumeration^ CppSharp::Parser::AST::DeclarationContext::getEnums(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->getEnums(i);
@@ -1387,6 +1423,12 @@ CppSharp::Parser::AST::Enumeration^ CppSharp::Parser::AST::DeclarationContext::g
     return gcnew CppSharp::Parser::AST::Enumeration((::CppSharp::CppParser::AST::Enumeration*)__ret);
 }
 
+void CppSharp::Parser::AST::DeclarationContext::addEnums(CppSharp::Parser::AST::Enumeration^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::Enumeration*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->addEnums(arg0);
+}
+
 CppSharp::Parser::AST::Function^ CppSharp::Parser::AST::DeclarationContext::getFunctions(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->getFunctions(i);
@@ -1394,6 +1436,12 @@ CppSharp::Parser::AST::Function^ CppSharp::Parser::AST::DeclarationContext::getF
     return gcnew CppSharp::Parser::AST::Function((::CppSharp::CppParser::AST::Function*)__ret);
 }
 
+void CppSharp::Parser::AST::DeclarationContext::addFunctions(CppSharp::Parser::AST::Function^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::Function*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->addFunctions(arg0);
+}
+
 CppSharp::Parser::AST::Class^ CppSharp::Parser::AST::DeclarationContext::getClasses(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->getClasses(i);
@@ -1401,6 +1449,12 @@ CppSharp::Parser::AST::Class^ CppSharp::Parser::AST::DeclarationContext::getClas
     return gcnew CppSharp::Parser::AST::Class((::CppSharp::CppParser::AST::Class*)__ret);
 }
 
+void CppSharp::Parser::AST::DeclarationContext::addClasses(CppSharp::Parser::AST::Class^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::Class*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->addClasses(arg0);
+}
+
 CppSharp::Parser::AST::Template^ CppSharp::Parser::AST::DeclarationContext::getTemplates(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->getTemplates(i);
@@ -1408,6 +1462,12 @@ CppSharp::Parser::AST::Template^ CppSharp::Parser::AST::DeclarationContext::getT
     return gcnew CppSharp::Parser::AST::Template((::CppSharp::CppParser::AST::Template*)__ret);
 }
 
+void CppSharp::Parser::AST::DeclarationContext::addTemplates(CppSharp::Parser::AST::Template^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::Template*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->addTemplates(arg0);
+}
+
 CppSharp::Parser::AST::TypedefDecl^ CppSharp::Parser::AST::DeclarationContext::getTypedefs(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->getTypedefs(i);
@@ -1415,6 +1475,12 @@ CppSharp::Parser::AST::TypedefDecl^ CppSharp::Parser::AST::DeclarationContext::g
     return gcnew CppSharp::Parser::AST::TypedefDecl((::CppSharp::CppParser::AST::TypedefDecl*)__ret);
 }
 
+void CppSharp::Parser::AST::DeclarationContext::addTypedefs(CppSharp::Parser::AST::TypedefDecl^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::TypedefDecl*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->addTypedefs(arg0);
+}
+
 CppSharp::Parser::AST::Variable^ CppSharp::Parser::AST::DeclarationContext::getVariables(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->getVariables(i);
@@ -1422,6 +1488,12 @@ CppSharp::Parser::AST::Variable^ CppSharp::Parser::AST::DeclarationContext::getV
     return gcnew CppSharp::Parser::AST::Variable((::CppSharp::CppParser::AST::Variable*)__ret);
 }
 
+void CppSharp::Parser::AST::DeclarationContext::addVariables(CppSharp::Parser::AST::Variable^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::Variable*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->addVariables(arg0);
+}
+
 unsigned int CppSharp::Parser::AST::DeclarationContext::NamespacesCount::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->getNamespacesCount();
@@ -1562,6 +1634,12 @@ CppSharp::Parser::AST::Parameter^ CppSharp::Parser::AST::Function::getParameters
     return gcnew CppSharp::Parser::AST::Parameter((::CppSharp::CppParser::AST::Parameter*)__ret);
 }
 
+void CppSharp::Parser::AST::Function::addParameters(CppSharp::Parser::AST::Parameter^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::Parameter*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::Function*)NativePtr)->addParameters(arg0);
+}
+
 System::String^ CppSharp::Parser::AST::Function::Mangled::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::Function*)NativePtr)->getMangled();
@@ -1871,6 +1949,12 @@ CppSharp::Parser::AST::Enumeration::Item^ CppSharp::Parser::AST::Enumeration::ge
     return gcnew CppSharp::Parser::AST::Enumeration::Item((::CppSharp::CppParser::AST::Enumeration::Item*)____ret);
 }
 
+void CppSharp::Parser::AST::Enumeration::addItems(CppSharp::Parser::AST::Enumeration::Item^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::Enumeration::Item*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::Enumeration*)NativePtr)->addItems(arg0);
+}
+
 unsigned int CppSharp::Parser::AST::Enumeration::ItemsCount::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::Enumeration*)NativePtr)->getItemsCount();
@@ -2103,6 +2187,12 @@ CppSharp::Parser::AST::BaseClassSpecifier^ CppSharp::Parser::AST::Class::getBase
     return gcnew CppSharp::Parser::AST::BaseClassSpecifier((::CppSharp::CppParser::AST::BaseClassSpecifier*)__ret);
 }
 
+void CppSharp::Parser::AST::Class::addBases(CppSharp::Parser::AST::BaseClassSpecifier^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::BaseClassSpecifier*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::Class*)NativePtr)->addBases(arg0);
+}
+
 CppSharp::Parser::AST::Field^ CppSharp::Parser::AST::Class::getFields(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::Class*)NativePtr)->getFields(i);
@@ -2110,6 +2200,12 @@ CppSharp::Parser::AST::Field^ CppSharp::Parser::AST::Class::getFields(unsigned i
     return gcnew CppSharp::Parser::AST::Field((::CppSharp::CppParser::AST::Field*)__ret);
 }
 
+void CppSharp::Parser::AST::Class::addFields(CppSharp::Parser::AST::Field^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::Field*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::Class*)NativePtr)->addFields(arg0);
+}
+
 CppSharp::Parser::AST::Method^ CppSharp::Parser::AST::Class::getMethods(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::Class*)NativePtr)->getMethods(i);
@@ -2117,6 +2213,12 @@ CppSharp::Parser::AST::Method^ CppSharp::Parser::AST::Class::getMethods(unsigned
     return gcnew CppSharp::Parser::AST::Method((::CppSharp::CppParser::AST::Method*)__ret);
 }
 
+void CppSharp::Parser::AST::Class::addMethods(CppSharp::Parser::AST::Method^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::Method*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::Class*)NativePtr)->addMethods(arg0);
+}
+
 CppSharp::Parser::AST::AccessSpecifierDecl^ CppSharp::Parser::AST::Class::getSpecifiers(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::Class*)NativePtr)->getSpecifiers(i);
@@ -2124,6 +2226,12 @@ CppSharp::Parser::AST::AccessSpecifierDecl^ CppSharp::Parser::AST::Class::getSpe
     return gcnew CppSharp::Parser::AST::AccessSpecifierDecl((::CppSharp::CppParser::AST::AccessSpecifierDecl*)__ret);
 }
 
+void CppSharp::Parser::AST::Class::addSpecifiers(CppSharp::Parser::AST::AccessSpecifierDecl^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::AccessSpecifierDecl*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::Class*)NativePtr)->addSpecifiers(arg0);
+}
+
 unsigned int CppSharp::Parser::AST::Class::BasesCount::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::Class*)NativePtr)->getBasesCount();
@@ -2228,6 +2336,16 @@ void CppSharp::Parser::AST::Class::HasNonTrivialDestructor::set(bool value)
     ((::CppSharp::CppParser::AST::Class*)NativePtr)->HasNonTrivialDestructor = value;
 }
 
+bool CppSharp::Parser::AST::Class::IsExternCContext::get()
+{
+    return ((::CppSharp::CppParser::AST::Class*)NativePtr)->IsExternCContext;
+}
+
+void CppSharp::Parser::AST::Class::IsExternCContext::set(bool value)
+{
+    ((::CppSharp::CppParser::AST::Class*)NativePtr)->IsExternCContext = value;
+}
+
 CppSharp::Parser::AST::ClassLayout^ CppSharp::Parser::AST::Class::Layout::get()
 {
     return gcnew CppSharp::Parser::AST::ClassLayout((::CppSharp::CppParser::AST::ClassLayout*)&((::CppSharp::CppParser::AST::Class*)NativePtr)->Layout);
@@ -2262,6 +2380,12 @@ CppSharp::Parser::AST::TemplateParameter^ CppSharp::Parser::AST::Template::getPa
     return gcnew CppSharp::Parser::AST::TemplateParameter((::CppSharp::CppParser::AST::TemplateParameter*)____ret);
 }
 
+void CppSharp::Parser::AST::Template::addParameters(CppSharp::Parser::AST::TemplateParameter^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::TemplateParameter*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::Template*)NativePtr)->addParameters(arg0);
+}
+
 unsigned int CppSharp::Parser::AST::Template::ParametersCount::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::Template*)NativePtr)->getParametersCount();
@@ -2302,6 +2426,12 @@ CppSharp::Parser::AST::ClassTemplateSpecialization^ CppSharp::Parser::AST::Class
     return gcnew CppSharp::Parser::AST::ClassTemplateSpecialization((::CppSharp::CppParser::AST::ClassTemplateSpecialization*)__ret);
 }
 
+void CppSharp::Parser::AST::ClassTemplate::addSpecializations(CppSharp::Parser::AST::ClassTemplateSpecialization^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::ClassTemplateSpecialization*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::ClassTemplate*)NativePtr)->addSpecializations(arg0);
+}
+
 CppSharp::Parser::AST::ClassTemplateSpecialization^ CppSharp::Parser::AST::ClassTemplate::FindSpecialization(System::IntPtr ptr)
 {
     auto arg0 = (void*)ptr.ToPointer();
@@ -2364,6 +2494,12 @@ CppSharp::Parser::AST::TemplateArgument^ CppSharp::Parser::AST::ClassTemplateSpe
     return gcnew CppSharp::Parser::AST::TemplateArgument((::CppSharp::CppParser::AST::TemplateArgument*)____ret);
 }
 
+void CppSharp::Parser::AST::ClassTemplateSpecialization::addArguments(CppSharp::Parser::AST::TemplateArgument^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::TemplateArgument*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::ClassTemplateSpecialization*)NativePtr)->addArguments(arg0);
+}
+
 unsigned int CppSharp::Parser::AST::ClassTemplateSpecialization::ArgumentsCount::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::ClassTemplateSpecialization*)NativePtr)->getArgumentsCount();
@@ -2566,6 +2702,12 @@ CppSharp::Parser::AST::MacroDefinition^ CppSharp::Parser::AST::TranslationUnit::
     return gcnew CppSharp::Parser::AST::MacroDefinition((::CppSharp::CppParser::AST::MacroDefinition*)__ret);
 }
 
+void CppSharp::Parser::AST::TranslationUnit::addMacros(CppSharp::Parser::AST::MacroDefinition^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::MacroDefinition*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::TranslationUnit*)NativePtr)->addMacros(arg0);
+}
+
 System::String^ CppSharp::Parser::AST::TranslationUnit::FileName::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::TranslationUnit*)NativePtr)->getFileName();
@@ -2615,6 +2757,13 @@ System::String^ CppSharp::Parser::AST::NativeLibrary::getSymbols(unsigned int i)
     return clix::marshalString<clix::E_UTF8>(__ret);
 }
 
+void CppSharp::Parser::AST::NativeLibrary::addSymbols(System::String^ s)
+{
+    auto _arg0 = clix::marshalString<clix::E_UTF8>(s);
+    auto arg0 = _arg0.c_str();
+    ((::CppSharp::CppParser::AST::NativeLibrary*)NativePtr)->addSymbols(arg0);
+}
+
 CppSharp::Parser::AST::NativeLibrary::NativeLibrary()
 {
     NativePtr = new ::CppSharp::CppParser::AST::NativeLibrary();
@@ -2677,6 +2826,12 @@ CppSharp::Parser::AST::TranslationUnit^ CppSharp::Parser::AST::ASTContext::getTr
     return gcnew CppSharp::Parser::AST::TranslationUnit((::CppSharp::CppParser::AST::TranslationUnit*)__ret);
 }
 
+void CppSharp::Parser::AST::ASTContext::addTranslationUnits(CppSharp::Parser::AST::TranslationUnit^ s)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::TranslationUnit*)s->NativePtr;
+    ((::CppSharp::CppParser::AST::ASTContext*)NativePtr)->addTranslationUnits(arg0);
+}
+
 CppSharp::Parser::AST::ASTContext::ASTContext()
 {
     NativePtr = new ::CppSharp::CppParser::AST::ASTContext();
diff --git a/src/CppParser/Bindings/CLI/AST.h b/src/CppParser/Bindings/CLI/AST.h
index d3b154ad..bf9dab05 100644
--- a/src/CppParser/Bindings/CLI/AST.h
+++ b/src/CppParser/Bindings/CLI/AST.h
@@ -434,6 +434,8 @@ namespace CppSharp
                 }
 
                 CppSharp::Parser::AST::Parameter^ getParameters(unsigned int i);
+
+                void addParameters(CppSharp::Parser::AST::Parameter^ s);
             };
 
             public ref class PointerType : CppSharp::Parser::AST::Type
@@ -621,6 +623,8 @@ namespace CppSharp
                 }
 
                 CppSharp::Parser::AST::TemplateArgument^ getArguments(unsigned int i);
+
+                void addArguments(CppSharp::Parser::AST::TemplateArgument^ s);
             };
 
             public ref class TemplateParameter : ICppInstance
@@ -811,6 +815,8 @@ namespace CppSharp
                 }
 
                 CppSharp::Parser::AST::VTableComponent^ getComponents(unsigned int i);
+
+                void addComponents(CppSharp::Parser::AST::VTableComponent^ s);
             };
 
             public ref class VFTableInfo : ICppInstance
@@ -916,6 +922,8 @@ namespace CppSharp
                 }
 
                 CppSharp::Parser::AST::VFTableInfo^ getVFTables(unsigned int i);
+
+                void addVFTables(CppSharp::Parser::AST::VFTableInfo^ s);
             };
 
             public ref class Declaration : ICppInstance
@@ -1005,6 +1013,8 @@ namespace CppSharp
                 }
 
                 CppSharp::Parser::AST::PreprocessedEntity^ getPreprocessedEntities(unsigned int i);
+
+                void addPreprocessedEntities(CppSharp::Parser::AST::PreprocessedEntity^ s);
             };
 
             public ref class DeclarationContext : CppSharp::Parser::AST::Declaration
@@ -1076,17 +1086,31 @@ namespace CppSharp
 
                 CppSharp::Parser::AST::Namespace^ getNamespaces(unsigned int i);
 
+                void addNamespaces(CppSharp::Parser::AST::Namespace^ s);
+
                 CppSharp::Parser::AST::Enumeration^ getEnums(unsigned int i);
 
+                void addEnums(CppSharp::Parser::AST::Enumeration^ s);
+
                 CppSharp::Parser::AST::Function^ getFunctions(unsigned int i);
 
+                void addFunctions(CppSharp::Parser::AST::Function^ s);
+
                 CppSharp::Parser::AST::Class^ getClasses(unsigned int i);
 
+                void addClasses(CppSharp::Parser::AST::Class^ s);
+
                 CppSharp::Parser::AST::Template^ getTemplates(unsigned int i);
 
+                void addTemplates(CppSharp::Parser::AST::Template^ s);
+
                 CppSharp::Parser::AST::TypedefDecl^ getTypedefs(unsigned int i);
 
+                void addTypedefs(CppSharp::Parser::AST::TypedefDecl^ s);
+
                 CppSharp::Parser::AST::Variable^ getVariables(unsigned int i);
+
+                void addVariables(CppSharp::Parser::AST::Variable^ s);
             };
 
             public ref class TypedefDecl : CppSharp::Parser::AST::Declaration
@@ -1205,6 +1229,8 @@ namespace CppSharp
                 }
 
                 CppSharp::Parser::AST::Parameter^ getParameters(unsigned int i);
+
+                void addParameters(CppSharp::Parser::AST::Parameter^ s);
             };
 
             public ref class Method : CppSharp::Parser::AST::Function
@@ -1343,6 +1369,8 @@ namespace CppSharp
                 }
 
                 CppSharp::Parser::AST::Enumeration::Item^ getItems(unsigned int i);
+
+                void addItems(CppSharp::Parser::AST::Enumeration::Item^ s);
             };
 
             public ref class Variable : CppSharp::Parser::AST::Declaration
@@ -1518,6 +1546,12 @@ namespace CppSharp
                     void set(bool);
                 }
 
+                property bool IsExternCContext
+                {
+                    bool get();
+                    void set(bool);
+                }
+
                 property CppSharp::Parser::AST::ClassLayout^ Layout
                 {
                     CppSharp::Parser::AST::ClassLayout^ get();
@@ -1526,11 +1560,19 @@ namespace CppSharp
 
                 CppSharp::Parser::AST::BaseClassSpecifier^ getBases(unsigned int i);
 
+                void addBases(CppSharp::Parser::AST::BaseClassSpecifier^ s);
+
                 CppSharp::Parser::AST::Field^ getFields(unsigned int i);
 
+                void addFields(CppSharp::Parser::AST::Field^ s);
+
                 CppSharp::Parser::AST::Method^ getMethods(unsigned int i);
 
+                void addMethods(CppSharp::Parser::AST::Method^ s);
+
                 CppSharp::Parser::AST::AccessSpecifierDecl^ getSpecifiers(unsigned int i);
+
+                void addSpecifiers(CppSharp::Parser::AST::AccessSpecifierDecl^ s);
             };
 
             public ref class Template : CppSharp::Parser::AST::Declaration
@@ -1553,6 +1595,8 @@ namespace CppSharp
                 }
 
                 CppSharp::Parser::AST::TemplateParameter^ getParameters(unsigned int i);
+
+                void addParameters(CppSharp::Parser::AST::TemplateParameter^ s);
             };
 
             public ref class ClassTemplate : CppSharp::Parser::AST::Template
@@ -1570,6 +1614,8 @@ namespace CppSharp
 
                 CppSharp::Parser::AST::ClassTemplateSpecialization^ getSpecializations(unsigned int i);
 
+                void addSpecializations(CppSharp::Parser::AST::ClassTemplateSpecialization^ s);
+
                 CppSharp::Parser::AST::ClassTemplateSpecialization^ FindSpecialization(System::IntPtr ptr);
 
                 CppSharp::Parser::AST::ClassTemplateSpecialization^ FindSpecialization(CppSharp::Parser::AST::TemplateSpecializationType^ type);
@@ -1605,6 +1651,8 @@ namespace CppSharp
                 }
 
                 CppSharp::Parser::AST::TemplateArgument^ getArguments(unsigned int i);
+
+                void addArguments(CppSharp::Parser::AST::TemplateArgument^ s);
             };
 
             public ref class ClassTemplatePartialSpecialization : CppSharp::Parser::AST::ClassTemplateSpecialization
@@ -1711,6 +1759,8 @@ namespace CppSharp
                 }
 
                 CppSharp::Parser::AST::MacroDefinition^ getMacros(unsigned int i);
+
+                void addMacros(CppSharp::Parser::AST::MacroDefinition^ s);
             };
 
             public ref class NativeLibrary : ICppInstance
@@ -1740,6 +1790,8 @@ namespace CppSharp
                 }
 
                 System::String^ getSymbols(unsigned int i);
+
+                void addSymbols(System::String^ s);
             };
 
             public ref class ASTContext : ICppInstance
@@ -1765,6 +1817,8 @@ namespace CppSharp
                 CppSharp::Parser::AST::TranslationUnit^ FindOrCreateModule(System::String^ File);
 
                 CppSharp::Parser::AST::TranslationUnit^ getTranslationUnits(unsigned int i);
+
+                void addTranslationUnits(CppSharp::Parser::AST::TranslationUnit^ s);
             };
         }
     }
diff --git a/src/CppParser/Bindings/CLI/CppParser.cpp b/src/CppParser/Bindings/CLI/CppParser.cpp
index 7bd53684..b416cf64 100644
--- a/src/CppParser/Bindings/CLI/CppParser.cpp
+++ b/src/CppParser/Bindings/CLI/CppParser.cpp
@@ -307,6 +307,11 @@ CppSharp::Parser::ParserResult::ParserResult(System::IntPtr native)
     NativePtr = __native;
 }
 
+CppSharp::Parser::ParserResult::ParserResult()
+{
+    NativePtr = new ::CppSharp::CppParser::ParserResult();
+}
+
 CppSharp::Parser::ParserDiagnostic^ CppSharp::Parser::ParserResult::getDiagnostics(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::ParserResult*)NativePtr)->getDiagnostics(i);
@@ -320,11 +325,6 @@ void CppSharp::Parser::ParserResult::addDiagnostics(CppSharp::Parser::ParserDiag
     ((::CppSharp::CppParser::ParserResult*)NativePtr)->addDiagnostics(arg0);
 }
 
-CppSharp::Parser::ParserResult::ParserResult()
-{
-    NativePtr = new ::CppSharp::CppParser::ParserResult();
-}
-
 System::IntPtr CppSharp::Parser::ParserResult::__Instance::get()
 {
     return System::IntPtr(NativePtr);
diff --git a/src/CppParser/Bindings/CSharp/AST.cs b/src/CppParser/Bindings/CSharp/AST.cs
index 65dd3287..e271becc 100644
--- a/src/CppParser/Bindings/CSharp/AST.cs
+++ b/src/CppParser/Bindings/CSharp/AST.cs
@@ -201,7 +201,7 @@ namespace CppSharp
                 ExplicitInstantiationDefinition = 4
             }
 
-            public unsafe partial class Type : IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class Type : IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 8)]
                 public struct Internal
@@ -225,19 +225,6 @@ namespace CppSharp
 
                 public global::System.IntPtr __Instance { get; protected set; }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 8; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal Type(Type.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -302,7 +289,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class TypeQualifiers : IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class TypeQualifiers : IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 3)]
                 public struct Internal
@@ -319,24 +306,11 @@ namespace CppSharp
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="??0TypeQualifiers@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")]
-                    internal static extern global::System.IntPtr ctor_1(global::System.IntPtr instance, global::System.IntPtr _0);
+                    internal static extern global::System.IntPtr ctor_0(global::System.IntPtr instance, global::System.IntPtr _0);
                 }
 
                 public global::System.IntPtr __Instance { get; protected set; }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 3; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal TypeQualifiers(TypeQualifiers.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -414,7 +388,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class QualifiedType : IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class QualifiedType : IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 8)]
                 public struct Internal
@@ -438,19 +412,6 @@ namespace CppSharp
 
                 public global::System.IntPtr __Instance { get; protected set; }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 8; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal QualifiedType(QualifiedType.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -518,7 +479,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class TagType : CppSharp.Parser.AST.Type, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class TagType : CppSharp.Parser.AST.Type, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 12)]
                 public new struct Internal
@@ -537,19 +498,6 @@ namespace CppSharp
                     internal static extern global::System.IntPtr ctor_1(global::System.IntPtr instance, global::System.IntPtr _0);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 12; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal TagType(TagType.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -594,7 +542,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class ArrayType : CppSharp.Parser.AST.Type, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class ArrayType : CppSharp.Parser.AST.Type, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 24)]
                 public new struct Internal
@@ -627,19 +575,6 @@ namespace CppSharp
                     Incomplete = 3
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 24; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal ArrayType(ArrayType.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -716,7 +651,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class FunctionType : CppSharp.Parser.AST.Type, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class FunctionType : CppSharp.Parser.AST.Type, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public new struct Internal
@@ -747,25 +682,17 @@ namespace CppSharp
                         EntryPoint="?getParameters@FunctionType@AST@CppParser@CppSharp@@QAEPAUParameter@234@I@Z")]
                     internal static extern global::System.IntPtr getParameters_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addParameters@FunctionType@AST@CppParser@CppSharp@@QAEXAAPAUParameter@234@@Z")]
+                    internal static extern void addParameters_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getParametersCount@FunctionType@AST@CppParser@CppSharp@@QAEIXZ")]
                     internal static extern uint getParametersCount_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 32; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal FunctionType(FunctionType.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -800,6 +727,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.Parameter(__ret);
                 }
 
+                public void addParameters(CppSharp.Parser.AST.Parameter s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.Parameter) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addParameters_0(__Instance, arg0);
+                }
+
                 public uint ParametersCount
                 {
                     get
@@ -843,7 +776,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class PointerType : CppSharp.Parser.AST.Type, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class PointerType : CppSharp.Parser.AST.Type, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 20)]
                 public new struct Internal
@@ -873,19 +806,6 @@ namespace CppSharp
                     RVReference = 3
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 20; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal PointerType(PointerType.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -947,7 +867,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class MemberPointerType : CppSharp.Parser.AST.Type, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class MemberPointerType : CppSharp.Parser.AST.Type, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 16)]
                 public new struct Internal
@@ -966,19 +886,6 @@ namespace CppSharp
                     internal static extern global::System.IntPtr ctor_1(global::System.IntPtr instance, global::System.IntPtr _0);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 16; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal MemberPointerType(MemberPointerType.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -1025,7 +932,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class TypedefType : CppSharp.Parser.AST.Type, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class TypedefType : CppSharp.Parser.AST.Type, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 12)]
                 public new struct Internal
@@ -1044,19 +951,6 @@ namespace CppSharp
                     internal static extern global::System.IntPtr ctor_1(global::System.IntPtr instance, global::System.IntPtr _0);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 12; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal TypedefType(TypedefType.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -1101,7 +995,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class AttributedType : CppSharp.Parser.AST.Type, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class AttributedType : CppSharp.Parser.AST.Type, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 24)]
                 public new struct Internal
@@ -1123,19 +1017,6 @@ namespace CppSharp
                     internal static extern global::System.IntPtr ctor_1(global::System.IntPtr instance, global::System.IntPtr _0);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 24; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal AttributedType(AttributedType.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -1200,7 +1081,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class DecayedType : CppSharp.Parser.AST.Type, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class DecayedType : CppSharp.Parser.AST.Type, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public new struct Internal
@@ -1225,19 +1106,6 @@ namespace CppSharp
                     internal static extern global::System.IntPtr ctor_1(global::System.IntPtr instance, global::System.IntPtr _0);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 32; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal DecayedType(DecayedType.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -1320,7 +1188,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class TemplateArgument : IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class TemplateArgument : IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 20)]
                 public struct Internal
@@ -1362,19 +1230,6 @@ namespace CppSharp
 
                 public global::System.IntPtr __Instance { get; protected set; }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 20; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal TemplateArgument(TemplateArgument.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -1472,7 +1327,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class TemplateSpecializationType : CppSharp.Parser.AST.Type, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class TemplateSpecializationType : CppSharp.Parser.AST.Type, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 28)]
                 public new struct Internal
@@ -1503,25 +1358,17 @@ namespace CppSharp
                         EntryPoint="?getArguments@TemplateSpecializationType@AST@CppParser@CppSharp@@QAE?AUTemplateArgument@234@I@Z")]
                     internal static extern void getArguments_0(global::System.IntPtr instance, global::System.IntPtr __return, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addArguments@TemplateSpecializationType@AST@CppParser@CppSharp@@QAEXAAUTemplateArgument@234@@Z")]
+                    internal static extern void addArguments_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getArgumentsCount@TemplateSpecializationType@AST@CppParser@CppSharp@@QAEIXZ")]
                     internal static extern uint getArgumentsCount_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 28; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal TemplateSpecializationType(TemplateSpecializationType.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -1558,6 +1405,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.TemplateArgument(__instance);
                 }
 
+                public void addArguments(CppSharp.Parser.AST.TemplateArgument s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.TemplateArgument) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addArguments_0(__Instance, arg0);
+                }
+
                 public uint ArgumentsCount
                 {
                     get
@@ -1600,7 +1453,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class TemplateParameter : IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class TemplateParameter : IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 24)]
                 public struct Internal
@@ -1639,19 +1492,6 @@ namespace CppSharp
 
                 public global::System.IntPtr __Instance { get; protected set; }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 24; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal TemplateParameter(TemplateParameter.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -1716,7 +1556,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class TemplateParameterType : CppSharp.Parser.AST.Type, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class TemplateParameterType : CppSharp.Parser.AST.Type, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public new struct Internal
@@ -1740,19 +1580,6 @@ namespace CppSharp
                     internal static extern void dtor_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 32; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal TemplateParameterType(TemplateParameterType.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -1799,7 +1626,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class TemplateParameterSubstitutionType : CppSharp.Parser.AST.Type, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class TemplateParameterSubstitutionType : CppSharp.Parser.AST.Type, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 16)]
                 public new struct Internal
@@ -1818,19 +1645,6 @@ namespace CppSharp
                     internal static extern global::System.IntPtr ctor_1(global::System.IntPtr instance, global::System.IntPtr _0);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 16; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal TemplateParameterSubstitutionType(TemplateParameterSubstitutionType.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -1877,7 +1691,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class InjectedClassNameType : CppSharp.Parser.AST.Type, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class InjectedClassNameType : CppSharp.Parser.AST.Type, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 40)]
                 public new struct Internal
@@ -1904,19 +1718,6 @@ namespace CppSharp
                     internal static extern void dtor_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 40; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal InjectedClassNameType(InjectedClassNameType.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -1979,7 +1780,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class DependentNameType : CppSharp.Parser.AST.Type, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class DependentNameType : CppSharp.Parser.AST.Type, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 8)]
                 public new struct Internal
@@ -1995,19 +1796,6 @@ namespace CppSharp
                     internal static extern global::System.IntPtr ctor_1(global::System.IntPtr instance, global::System.IntPtr _0);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 8; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal DependentNameType(DependentNameType.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -2036,7 +1824,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class BuiltinType : CppSharp.Parser.AST.Type, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class BuiltinType : CppSharp.Parser.AST.Type, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 12)]
                 public new struct Internal
@@ -2055,19 +1843,6 @@ namespace CppSharp
                     internal static extern global::System.IntPtr ctor_1(global::System.IntPtr instance, global::System.IntPtr _0);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 12; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal BuiltinType(BuiltinType.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -2111,7 +1886,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class RawComment : IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class RawComment : IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 56)]
                 public struct Internal
@@ -2122,7 +1897,7 @@ namespace CppSharp
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="??0RawComment@AST@CppParser@CppSharp@@QAE@XZ")]
-                    internal static extern global::System.IntPtr ctor_1(global::System.IntPtr instance);
+                    internal static extern global::System.IntPtr ctor_0(global::System.IntPtr instance);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -2157,19 +1932,6 @@ namespace CppSharp
 
                 public global::System.IntPtr __Instance { get; protected set; }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 56; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal RawComment(RawComment.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -2188,7 +1950,7 @@ namespace CppSharp
                 public RawComment()
                 {
                     __Instance = Marshal.AllocHGlobal(56);
-                    Internal.ctor_1(__Instance);
+                    Internal.ctor_0(__Instance);
                 }
 
                 public void Dispose()
@@ -2253,7 +2015,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class VTableComponent : IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class VTableComponent : IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 12)]
                 public struct Internal
@@ -2280,19 +2042,6 @@ namespace CppSharp
 
                 public global::System.IntPtr __Instance { get; protected set; }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 12; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal VTableComponent(VTableComponent.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -2372,20 +2121,20 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class VTableLayout : IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class VTableLayout : IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 12)]
                 public struct Internal
                 {
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0VTableLayout@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")]
-                    internal static extern global::System.IntPtr ctor_1(global::System.IntPtr instance, global::System.IntPtr _0);
+                        EntryPoint="??0VTableLayout@AST@CppParser@CppSharp@@QAE@XZ")]
+                    internal static extern global::System.IntPtr ctor_0(global::System.IntPtr instance);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                        EntryPoint="??0VTableLayout@AST@CppParser@CppSharp@@QAE@XZ")]
-                    internal static extern global::System.IntPtr ctor_2(global::System.IntPtr instance);
+                        EntryPoint="??0VTableLayout@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")]
+                    internal static extern global::System.IntPtr ctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -2397,6 +2146,11 @@ namespace CppSharp
                         EntryPoint="?getComponents@VTableLayout@AST@CppParser@CppSharp@@QAE?AUVTableComponent@234@I@Z")]
                     internal static extern void getComponents_0(global::System.IntPtr instance, global::System.IntPtr __return, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addComponents@VTableLayout@AST@CppParser@CppSharp@@QAEXAAUVTableComponent@234@@Z")]
+                    internal static extern void addComponents_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getComponentsCount@VTableLayout@AST@CppParser@CppSharp@@QAEIXZ")]
@@ -2405,19 +2159,6 @@ namespace CppSharp
 
                 public global::System.IntPtr __Instance { get; protected set; }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 12; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal VTableLayout(VTableLayout.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -2436,7 +2177,7 @@ namespace CppSharp
                 public VTableLayout()
                 {
                     __Instance = Marshal.AllocHGlobal(12);
-                    Internal.ctor_2(__Instance);
+                    Internal.ctor_0(__Instance);
                 }
 
                 public void Dispose()
@@ -2460,6 +2201,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.VTableComponent(__instance);
                 }
 
+                public void addComponents(CppSharp.Parser.AST.VTableComponent s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.VTableComponent) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addComponents_0(__Instance, arg0);
+                }
+
                 public uint ComponentsCount
                 {
                     get
@@ -2470,7 +2217,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class VFTableInfo : IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class VFTableInfo : IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 32)]
                 public struct Internal
@@ -2505,19 +2252,6 @@ namespace CppSharp
 
                 public global::System.IntPtr __Instance { get; protected set; }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 32; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal VFTableInfo(VFTableInfo.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -2603,7 +2337,7 @@ namespace CppSharp
                         var __ptr = (Internal*)__Instance.ToPointer();
                         var __copy = new global::System.IntPtr(&__ptr->Layout);
                         var __instance = Marshal.AllocHGlobal(12);
-                        CppSharp.Parser.AST.VTableLayout.Internal.ctor_1(__instance, new global::System.IntPtr(&__copy));
+                        CppSharp.Parser.AST.VTableLayout.Internal.ctor_2(__instance, new global::System.IntPtr(&__copy));
                         return new CppSharp.Parser.AST.VTableLayout(__instance);
                     }
 
@@ -2615,7 +2349,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class ClassLayout : IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class ClassLayout : IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 48)]
                 public struct Internal
@@ -2661,6 +2395,11 @@ namespace CppSharp
                         EntryPoint="?getVFTables@ClassLayout@AST@CppParser@CppSharp@@QAE?AUVFTableInfo@234@I@Z")]
                     internal static extern void getVFTables_0(global::System.IntPtr instance, global::System.IntPtr __return, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addVFTables@ClassLayout@AST@CppParser@CppSharp@@QAEXAAUVFTableInfo@234@@Z")]
+                    internal static extern void addVFTables_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getVFTablesCount@ClassLayout@AST@CppParser@CppSharp@@QAEIXZ")]
@@ -2669,19 +2408,6 @@ namespace CppSharp
 
                 public global::System.IntPtr __Instance { get; protected set; }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 48; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal ClassLayout(ClassLayout.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -2724,6 +2450,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.VFTableInfo(__instance);
                 }
 
+                public void addVFTables(CppSharp.Parser.AST.VFTableInfo s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.VFTableInfo) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addVFTables_0(__Instance, arg0);
+                }
+
                 public uint VFTablesCount
                 {
                     get
@@ -2755,7 +2487,7 @@ namespace CppSharp
                         var __ptr = (Internal*)__Instance.ToPointer();
                         var __copy = new global::System.IntPtr(&__ptr->Layout);
                         var __instance = Marshal.AllocHGlobal(12);
-                        CppSharp.Parser.AST.VTableLayout.Internal.ctor_1(__instance, new global::System.IntPtr(&__copy));
+                        CppSharp.Parser.AST.VTableLayout.Internal.ctor_2(__instance, new global::System.IntPtr(&__copy));
                         return new CppSharp.Parser.AST.VTableLayout(__instance);
                     }
 
@@ -2842,7 +2574,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class Declaration : IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class Declaration : IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public struct Internal
@@ -2894,6 +2626,11 @@ namespace CppSharp
                         EntryPoint="?getPreprocessedEntities@Declaration@AST@CppParser@CppSharp@@QAEPAUPreprocessedEntity@234@I@Z")]
                     internal static extern global::System.IntPtr getPreprocessedEntities_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addPreprocessedEntities@Declaration@AST@CppParser@CppSharp@@QAEXAAPAUPreprocessedEntity@234@@Z")]
+                    internal static extern void addPreprocessedEntities_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getName@Declaration@AST@CppParser@CppSharp@@QAEPBDXZ")]
@@ -2922,19 +2659,6 @@ namespace CppSharp
 
                 public global::System.IntPtr __Instance { get; protected set; }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 92; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal Declaration(Declaration.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -2976,6 +2700,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.PreprocessedEntity(__ret);
                 }
 
+                public void addPreprocessedEntities(CppSharp.Parser.AST.PreprocessedEntity s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.PreprocessedEntity) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addPreprocessedEntities_0(__Instance, arg0);
+                }
+
                 public string Name
                 {
                     get
@@ -3158,7 +2888,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class DeclarationContext : CppSharp.Parser.AST.Declaration, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class DeclarationContext : CppSharp.Parser.AST.Declaration, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 184)]
                 public new struct Internal
@@ -3243,36 +2973,71 @@ namespace CppSharp
                         EntryPoint="?getNamespaces@DeclarationContext@AST@CppParser@CppSharp@@QAEPAUNamespace@234@I@Z")]
                     internal static extern global::System.IntPtr getNamespaces_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addNamespaces@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAUNamespace@234@@Z")]
+                    internal static extern void addNamespaces_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getEnums@DeclarationContext@AST@CppParser@CppSharp@@QAEPAUEnumeration@234@I@Z")]
                     internal static extern global::System.IntPtr getEnums_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addEnums@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAUEnumeration@234@@Z")]
+                    internal static extern void addEnums_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getFunctions@DeclarationContext@AST@CppParser@CppSharp@@QAEPAUFunction@234@I@Z")]
                     internal static extern global::System.IntPtr getFunctions_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addFunctions@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAUFunction@234@@Z")]
+                    internal static extern void addFunctions_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getClasses@DeclarationContext@AST@CppParser@CppSharp@@QAEPAUClass@234@I@Z")]
                     internal static extern global::System.IntPtr getClasses_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addClasses@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAUClass@234@@Z")]
+                    internal static extern void addClasses_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getTemplates@DeclarationContext@AST@CppParser@CppSharp@@QAEPAUTemplate@234@I@Z")]
                     internal static extern global::System.IntPtr getTemplates_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addTemplates@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAUTemplate@234@@Z")]
+                    internal static extern void addTemplates_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getTypedefs@DeclarationContext@AST@CppParser@CppSharp@@QAEPAUTypedefDecl@234@I@Z")]
                     internal static extern global::System.IntPtr getTypedefs_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addTypedefs@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAUTypedefDecl@234@@Z")]
+                    internal static extern void addTypedefs_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getVariables@DeclarationContext@AST@CppParser@CppSharp@@QAEPAUVariable@234@I@Z")]
                     internal static extern global::System.IntPtr getVariables_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addVariables@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAUVariable@234@@Z")]
+                    internal static extern void addVariables_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getNamespacesCount@DeclarationContext@AST@CppParser@CppSharp@@QAEIXZ")]
@@ -3309,19 +3074,6 @@ namespace CppSharp
                     internal static extern uint getVariablesCount_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 184; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal DeclarationContext(DeclarationContext.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -3453,6 +3205,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.Namespace(__ret);
                 }
 
+                public void addNamespaces(CppSharp.Parser.AST.Namespace s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.Namespace) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addNamespaces_0(__Instance, arg0);
+                }
+
                 public CppSharp.Parser.AST.Enumeration getEnums(uint i)
                 {
                     var __ret = Internal.getEnums_0(__Instance, i);
@@ -3460,6 +3218,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.Enumeration(__ret);
                 }
 
+                public void addEnums(CppSharp.Parser.AST.Enumeration s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.Enumeration) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addEnums_0(__Instance, arg0);
+                }
+
                 public CppSharp.Parser.AST.Function getFunctions(uint i)
                 {
                     var __ret = Internal.getFunctions_0(__Instance, i);
@@ -3467,6 +3231,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.Function(__ret);
                 }
 
+                public void addFunctions(CppSharp.Parser.AST.Function s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.Function) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addFunctions_0(__Instance, arg0);
+                }
+
                 public CppSharp.Parser.AST.Class getClasses(uint i)
                 {
                     var __ret = Internal.getClasses_0(__Instance, i);
@@ -3474,6 +3244,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.Class(__ret);
                 }
 
+                public void addClasses(CppSharp.Parser.AST.Class s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.Class) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addClasses_0(__Instance, arg0);
+                }
+
                 public CppSharp.Parser.AST.Template getTemplates(uint i)
                 {
                     var __ret = Internal.getTemplates_0(__Instance, i);
@@ -3481,6 +3257,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.Template(__ret);
                 }
 
+                public void addTemplates(CppSharp.Parser.AST.Template s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.Template) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addTemplates_0(__Instance, arg0);
+                }
+
                 public CppSharp.Parser.AST.TypedefDecl getTypedefs(uint i)
                 {
                     var __ret = Internal.getTypedefs_0(__Instance, i);
@@ -3488,6 +3270,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.TypedefDecl(__ret);
                 }
 
+                public void addTypedefs(CppSharp.Parser.AST.TypedefDecl s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.TypedefDecl) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addTypedefs_0(__Instance, arg0);
+                }
+
                 public CppSharp.Parser.AST.Variable getVariables(uint i)
                 {
                     var __ret = Internal.getVariables_0(__Instance, i);
@@ -3495,6 +3283,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.Variable(__ret);
                 }
 
+                public void addVariables(CppSharp.Parser.AST.Variable s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.Variable) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addVariables_0(__Instance, arg0);
+                }
+
                 public uint NamespacesCount
                 {
                     get
@@ -3559,7 +3353,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class TypedefDecl : CppSharp.Parser.AST.Declaration, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class TypedefDecl : CppSharp.Parser.AST.Declaration, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 100)]
                 public new struct Internal
@@ -3583,19 +3377,6 @@ namespace CppSharp
                     internal static extern void dtor_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 100; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal TypedefDecl(TypedefDecl.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -3642,7 +3423,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class Parameter : CppSharp.Parser.AST.Declaration, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class Parameter : CppSharp.Parser.AST.Declaration, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 104)]
                 public new struct Internal
@@ -3672,19 +3453,6 @@ namespace CppSharp
                     internal static extern void dtor_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 104; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal Parameter(Parameter.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -3761,7 +3529,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class Function : CppSharp.Parser.AST.Declaration, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class Function : CppSharp.Parser.AST.Declaration, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 176)]
                 public new struct Internal
@@ -3810,6 +3578,11 @@ namespace CppSharp
                         EntryPoint="?getParameters@Function@AST@CppParser@CppSharp@@QAEPAUParameter@234@I@Z")]
                     internal static extern global::System.IntPtr getParameters_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addParameters@Function@AST@CppParser@CppSharp@@QAEXAAPAUParameter@234@@Z")]
+                    internal static extern void addParameters_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getMangled@Function@AST@CppParser@CppSharp@@QAEPBDXZ")]
@@ -3836,19 +3609,6 @@ namespace CppSharp
                     internal static extern uint getParametersCount_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 176; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal Function(Function.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -3883,6 +3643,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.Parameter(__ret);
                 }
 
+                public void addParameters(CppSharp.Parser.AST.Parameter s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.Parameter) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addParameters_0(__Instance, arg0);
+                }
+
                 public string Mangled
                 {
                     get
@@ -4050,7 +3816,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class Method : CppSharp.Parser.AST.Function, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class Method : CppSharp.Parser.AST.Function, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 204)]
                 public new struct Internal
@@ -4104,19 +3870,6 @@ namespace CppSharp
                     internal static extern void dtor_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 204; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal Method(Method.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -4314,7 +4067,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class Enumeration : CppSharp.Parser.AST.Declaration, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class Enumeration : CppSharp.Parser.AST.Declaration, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 116)]
                 public new struct Internal
@@ -4348,6 +4101,11 @@ namespace CppSharp
                         EntryPoint="?getItems@Enumeration@AST@CppParser@CppSharp@@QAE?AUItem@1234@I@Z")]
                     internal static extern void getItems_0(global::System.IntPtr instance, global::System.IntPtr __return, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addItems@Enumeration@AST@CppParser@CppSharp@@QAEXAAUItem@1234@@Z")]
+                    internal static extern void addItems_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getItemsCount@Enumeration@AST@CppParser@CppSharp@@QAEIXZ")]
@@ -4362,7 +4120,7 @@ namespace CppSharp
                     Flags = 4
                 }
 
-                public unsafe partial class Item : CppSharp.Parser.AST.Declaration, IDisposable, CppSharp.Runtime.ICppMarshal
+                public unsafe partial class Item : CppSharp.Parser.AST.Declaration, IDisposable
                 {
                     [StructLayout(LayoutKind.Explicit, Size = 128)]
                     public new struct Internal
@@ -4396,19 +4154,6 @@ namespace CppSharp
                         internal static extern void setExpression_0(global::System.IntPtr instance, global::System.IntPtr s);
                     }
 
-                    int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                    {
-                        get { return 128; }
-                    }
-
-                    void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                    {
-                    }
-
-                    void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                    {
-                    }
-
                     internal Item(Item.Internal* native)
                         : this(new global::System.IntPtr(native))
                     {
@@ -4469,19 +4214,6 @@ namespace CppSharp
                     }
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 116; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal Enumeration(Enumeration.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -4518,6 +4250,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.Enumeration.Item(__instance);
                 }
 
+                public void addItems(CppSharp.Parser.AST.Enumeration.Item s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.Enumeration.Item) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addItems_0(__Instance, arg0);
+                }
+
                 public uint ItemsCount
                 {
                     get
@@ -4575,7 +4313,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class Variable : CppSharp.Parser.AST.Declaration, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class Variable : CppSharp.Parser.AST.Declaration, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 124)]
                 public new struct Internal
@@ -4609,19 +4347,6 @@ namespace CppSharp
                     internal static extern void setMangled_0(global::System.IntPtr instance, global::System.IntPtr s);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 124; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal Variable(Variable.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -4685,7 +4410,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class BaseClassSpecifier : IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class BaseClassSpecifier : IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 12)]
                 public struct Internal
@@ -4699,6 +4424,11 @@ namespace CppSharp
                     [FieldOffset(8)]
                     public global::System.IntPtr Type;
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="??0BaseClassSpecifier@AST@CppParser@CppSharp@@QAE@XZ")]
+                    internal static extern global::System.IntPtr ctor_0(global::System.IntPtr instance);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="??0BaseClassSpecifier@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")]
@@ -4707,19 +4437,6 @@ namespace CppSharp
 
                 public global::System.IntPtr __Instance { get; protected set; }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 12; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal BaseClassSpecifier(BaseClassSpecifier.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -4738,6 +4455,7 @@ namespace CppSharp
                 public BaseClassSpecifier()
                 {
                     __Instance = Marshal.AllocHGlobal(12);
+                    Internal.ctor_0(__Instance);
                 }
 
                 public void Dispose()
@@ -4798,7 +4516,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class Field : CppSharp.Parser.AST.Declaration, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class Field : CppSharp.Parser.AST.Declaration, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 112)]
                 public new struct Internal
@@ -4831,19 +4549,6 @@ namespace CppSharp
                     internal static extern void dtor_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 112; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal Field(Field.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -4936,7 +4641,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class AccessSpecifierDecl : CppSharp.Parser.AST.Declaration, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class AccessSpecifierDecl : CppSharp.Parser.AST.Declaration, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new struct Internal
@@ -4957,19 +4662,6 @@ namespace CppSharp
                     internal static extern void dtor_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 92; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal AccessSpecifierDecl(AccessSpecifierDecl.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -4998,9 +4690,9 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class Class : CppSharp.Parser.AST.DeclarationContext, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class Class : CppSharp.Parser.AST.DeclarationContext, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 288)]
+                [StructLayout(LayoutKind.Explicit, Size = 292)]
                 public new struct Internal
                 {
                     [FieldOffset(232)]
@@ -5028,6 +4720,9 @@ namespace CppSharp
                     public bool HasNonTrivialDestructor;
 
                     [FieldOffset(240)]
+                    public bool IsExternCContext;
+
+                    [FieldOffset(244)]
                     public CppSharp.Parser.AST.ClassLayout.Internal Layout;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -5050,21 +4745,41 @@ namespace CppSharp
                         EntryPoint="?getBases@Class@AST@CppParser@CppSharp@@QAEPAUBaseClassSpecifier@234@I@Z")]
                     internal static extern global::System.IntPtr getBases_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addBases@Class@AST@CppParser@CppSharp@@QAEXAAPAUBaseClassSpecifier@234@@Z")]
+                    internal static extern void addBases_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getFields@Class@AST@CppParser@CppSharp@@QAEPAUField@234@I@Z")]
                     internal static extern global::System.IntPtr getFields_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addFields@Class@AST@CppParser@CppSharp@@QAEXAAPAUField@234@@Z")]
+                    internal static extern void addFields_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getMethods@Class@AST@CppParser@CppSharp@@QAEPAUMethod@234@I@Z")]
                     internal static extern global::System.IntPtr getMethods_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addMethods@Class@AST@CppParser@CppSharp@@QAEXAAPAUMethod@234@@Z")]
+                    internal static extern void addMethods_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getSpecifiers@Class@AST@CppParser@CppSharp@@QAEPAUAccessSpecifierDecl@234@I@Z")]
                     internal static extern global::System.IntPtr getSpecifiers_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addSpecifiers@Class@AST@CppParser@CppSharp@@QAEXAAPAUAccessSpecifierDecl@234@@Z")]
+                    internal static extern void addSpecifiers_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getBasesCount@Class@AST@CppParser@CppSharp@@QAEIXZ")]
@@ -5086,19 +4801,6 @@ namespace CppSharp
                     internal static extern uint getSpecifiersCount_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 288; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal Class(Class.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -5117,7 +4819,7 @@ namespace CppSharp
                 public Class()
                     : this(IntPtr.Zero)
                 {
-                    __Instance = Marshal.AllocHGlobal(288);
+                    __Instance = Marshal.AllocHGlobal(292);
                     Internal.ctor_0(__Instance);
                 }
 
@@ -5133,6 +4835,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.BaseClassSpecifier(__ret);
                 }
 
+                public void addBases(CppSharp.Parser.AST.BaseClassSpecifier s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.BaseClassSpecifier) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addBases_0(__Instance, arg0);
+                }
+
                 public CppSharp.Parser.AST.Field getFields(uint i)
                 {
                     var __ret = Internal.getFields_0(__Instance, i);
@@ -5140,6 +4848,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.Field(__ret);
                 }
 
+                public void addFields(CppSharp.Parser.AST.Field s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.Field) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addFields_0(__Instance, arg0);
+                }
+
                 public CppSharp.Parser.AST.Method getMethods(uint i)
                 {
                     var __ret = Internal.getMethods_0(__Instance, i);
@@ -5147,6 +4861,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.Method(__ret);
                 }
 
+                public void addMethods(CppSharp.Parser.AST.Method s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.Method) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addMethods_0(__Instance, arg0);
+                }
+
                 public CppSharp.Parser.AST.AccessSpecifierDecl getSpecifiers(uint i)
                 {
                     var __ret = Internal.getSpecifiers_0(__Instance, i);
@@ -5154,6 +4874,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.AccessSpecifierDecl(__ret);
                 }
 
+                public void addSpecifiers(CppSharp.Parser.AST.AccessSpecifierDecl s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.AccessSpecifierDecl) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addSpecifiers_0(__Instance, arg0);
+                }
+
                 public uint BasesCount
                 {
                     get
@@ -5310,6 +5036,21 @@ namespace CppSharp
                     }
                 }
 
+                public bool IsExternCContext
+                {
+                    get
+                    {
+                        var __ptr = (Internal*)__Instance.ToPointer();
+                        return __ptr->IsExternCContext;
+                    }
+
+                    set
+                    {
+                        var __ptr = (Internal*)__Instance.ToPointer();
+                        __ptr->IsExternCContext = value;
+                    }
+                }
+
                 public CppSharp.Parser.AST.ClassLayout Layout
                 {
                     get
@@ -5329,7 +5070,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class Template : CppSharp.Parser.AST.Declaration, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class Template : CppSharp.Parser.AST.Declaration, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 108)]
                 public new struct Internal
@@ -5357,25 +5098,17 @@ namespace CppSharp
                         EntryPoint="?getParameters@Template@AST@CppParser@CppSharp@@QAE?AUTemplateParameter@234@I@Z")]
                     internal static extern void getParameters_0(global::System.IntPtr instance, global::System.IntPtr __return, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addParameters@Template@AST@CppParser@CppSharp@@QAEXAAUTemplateParameter@234@@Z")]
+                    internal static extern void addParameters_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getParametersCount@Template@AST@CppParser@CppSharp@@QAEIXZ")]
                     internal static extern uint getParametersCount_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 108; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal Template(Template.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -5412,6 +5145,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.TemplateParameter(__instance);
                 }
 
+                public void addParameters(CppSharp.Parser.AST.TemplateParameter s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.TemplateParameter) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addParameters_0(__Instance, arg0);
+                }
+
                 public uint ParametersCount
                 {
                     get
@@ -5438,7 +5177,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class ClassTemplate : CppSharp.Parser.AST.Template, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class ClassTemplate : CppSharp.Parser.AST.Template, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new struct Internal
@@ -5463,6 +5202,11 @@ namespace CppSharp
                         EntryPoint="?getSpecializations@ClassTemplate@AST@CppParser@CppSharp@@QAEPAUClassTemplateSpecialization@234@I@Z")]
                     internal static extern global::System.IntPtr getSpecializations_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addSpecializations@ClassTemplate@AST@CppParser@CppSharp@@QAEXAAPAUClassTemplateSpecialization@234@@Z")]
+                    internal static extern void addSpecializations_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?FindSpecialization@ClassTemplate@AST@CppParser@CppSharp@@QAEPAUClassTemplateSpecialization@234@PAX@Z")]
@@ -5489,19 +5233,6 @@ namespace CppSharp
                     internal static extern uint getSpecializationsCount_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 120; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal ClassTemplate(ClassTemplate.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -5536,6 +5267,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.ClassTemplateSpecialization(__ret);
                 }
 
+                public void addSpecializations(CppSharp.Parser.AST.ClassTemplateSpecialization s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.ClassTemplateSpecialization) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addSpecializations_0(__Instance, arg0);
+                }
+
                 public CppSharp.Parser.AST.ClassTemplateSpecialization FindSpecialization(global::System.IntPtr ptr)
                 {
                     var arg0 = ptr;
@@ -5578,15 +5315,15 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class ClassTemplateSpecialization : CppSharp.Parser.AST.Class, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class ClassTemplateSpecialization : CppSharp.Parser.AST.Class, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 308)]
+                [StructLayout(LayoutKind.Explicit, Size = 312)]
                 public new struct Internal
                 {
-                    [FieldOffset(288)]
+                    [FieldOffset(292)]
                     public global::System.IntPtr TemplatedDecl;
 
-                    [FieldOffset(304)]
+                    [FieldOffset(308)]
                     public CppSharp.Parser.AST.TemplateSpecializationKind SpecializationKind;
 
                     [SuppressUnmanagedCodeSecurity]
@@ -5609,25 +5346,17 @@ namespace CppSharp
                         EntryPoint="?getArguments@ClassTemplateSpecialization@AST@CppParser@CppSharp@@QAE?AUTemplateArgument@234@I@Z")]
                     internal static extern void getArguments_0(global::System.IntPtr instance, global::System.IntPtr __return, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addArguments@ClassTemplateSpecialization@AST@CppParser@CppSharp@@QAEXAAUTemplateArgument@234@@Z")]
+                    internal static extern void addArguments_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getArgumentsCount@ClassTemplateSpecialization@AST@CppParser@CppSharp@@QAEIXZ")]
                     internal static extern uint getArgumentsCount_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 308; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal ClassTemplateSpecialization(ClassTemplateSpecialization.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -5646,7 +5375,7 @@ namespace CppSharp
                 public ClassTemplateSpecialization()
                     : this(IntPtr.Zero)
                 {
-                    __Instance = Marshal.AllocHGlobal(308);
+                    __Instance = Marshal.AllocHGlobal(312);
                     Internal.ctor_0(__Instance);
                 }
 
@@ -5664,6 +5393,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.TemplateArgument(__instance);
                 }
 
+                public void addArguments(CppSharp.Parser.AST.TemplateArgument s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.TemplateArgument) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addArguments_0(__Instance, arg0);
+                }
+
                 public uint ArgumentsCount
                 {
                     get
@@ -5705,9 +5440,9 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class ClassTemplatePartialSpecialization : CppSharp.Parser.AST.ClassTemplateSpecialization, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class ClassTemplatePartialSpecialization : CppSharp.Parser.AST.ClassTemplateSpecialization, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 308)]
+                [StructLayout(LayoutKind.Explicit, Size = 312)]
                 public new struct Internal
                 {
                     [SuppressUnmanagedCodeSecurity]
@@ -5726,19 +5461,6 @@ namespace CppSharp
                     internal static extern void dtor_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 308; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal ClassTemplatePartialSpecialization(ClassTemplatePartialSpecialization.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -5757,7 +5479,7 @@ namespace CppSharp
                 public ClassTemplatePartialSpecialization()
                     : this(IntPtr.Zero)
                 {
-                    __Instance = Marshal.AllocHGlobal(308);
+                    __Instance = Marshal.AllocHGlobal(312);
                     Internal.ctor_0(__Instance);
                 }
 
@@ -5767,7 +5489,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class FunctionTemplate : CppSharp.Parser.AST.Template, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class FunctionTemplate : CppSharp.Parser.AST.Template, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 108)]
                 public new struct Internal
@@ -5788,19 +5510,6 @@ namespace CppSharp
                     internal static extern void dtor_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 108; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal FunctionTemplate(FunctionTemplate.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -5829,7 +5538,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class Namespace : CppSharp.Parser.AST.DeclarationContext, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class Namespace : CppSharp.Parser.AST.DeclarationContext, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 184)]
                 public new struct Internal
@@ -5850,19 +5559,6 @@ namespace CppSharp
                     internal static extern void dtor_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 184; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal Namespace(Namespace.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -5891,7 +5587,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class PreprocessedEntity : CppSharp.Parser.AST.Declaration, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class PreprocessedEntity : CppSharp.Parser.AST.Declaration, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 96)]
                 public new struct Internal
@@ -5915,19 +5611,6 @@ namespace CppSharp
                     internal static extern void dtor_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 96; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal PreprocessedEntity(PreprocessedEntity.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -5971,7 +5654,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class MacroDefinition : CppSharp.Parser.AST.PreprocessedEntity, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class MacroDefinition : CppSharp.Parser.AST.PreprocessedEntity, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 120)]
                 public new struct Internal
@@ -6002,19 +5685,6 @@ namespace CppSharp
                     internal static extern void setExpression_0(global::System.IntPtr instance, global::System.IntPtr s);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 120; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal MacroDefinition(MacroDefinition.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -6060,7 +5730,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class MacroExpansion : CppSharp.Parser.AST.PreprocessedEntity, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class MacroExpansion : CppSharp.Parser.AST.PreprocessedEntity, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 124)]
                 public new struct Internal
@@ -6094,19 +5764,6 @@ namespace CppSharp
                     internal static extern void setText_0(global::System.IntPtr instance, global::System.IntPtr s);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 124; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal MacroExpansion(MacroExpansion.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -6168,7 +5825,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class TranslationUnit : CppSharp.Parser.AST.Namespace, IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class TranslationUnit : CppSharp.Parser.AST.Namespace, IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 224)]
                 public new struct Internal
@@ -6196,6 +5853,11 @@ namespace CppSharp
                         EntryPoint="?getMacros@TranslationUnit@AST@CppParser@CppSharp@@QAEPAUMacroDefinition@234@I@Z")]
                     internal static extern global::System.IntPtr getMacros_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addMacros@TranslationUnit@AST@CppParser@CppSharp@@QAEXAAPAUMacroDefinition@234@@Z")]
+                    internal static extern void addMacros_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getFileName@TranslationUnit@AST@CppParser@CppSharp@@QAEPBDXZ")]
@@ -6212,19 +5874,6 @@ namespace CppSharp
                     internal static extern uint getMacrosCount_0(global::System.IntPtr instance);
                 }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 224; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal TranslationUnit(TranslationUnit.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -6259,6 +5908,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.MacroDefinition(__ret);
                 }
 
+                public void addMacros(CppSharp.Parser.AST.MacroDefinition s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.MacroDefinition) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addMacros_0(__Instance, arg0);
+                }
+
                 public string FileName
                 {
                     get
@@ -6301,7 +5956,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class NativeLibrary : IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class NativeLibrary : IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public struct Internal
@@ -6326,6 +5981,11 @@ namespace CppSharp
                         EntryPoint="?getSymbols@NativeLibrary@AST@CppParser@CppSharp@@QAEPBDI@Z")]
                     internal static extern global::System.IntPtr getSymbols_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addSymbols@NativeLibrary@AST@CppParser@CppSharp@@QAEXPBD@Z")]
+                    internal static extern void addSymbols_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getFileName@NativeLibrary@AST@CppParser@CppSharp@@QAEPBDXZ")]
@@ -6344,19 +6004,6 @@ namespace CppSharp
 
                 public global::System.IntPtr __Instance { get; protected set; }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 36; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal NativeLibrary(NativeLibrary.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -6397,6 +6044,13 @@ namespace CppSharp
                     return Marshal.PtrToStringAnsi(__ret);
                 }
 
+                public void addSymbols(string s)
+                {
+                    var arg0 = Marshal.StringToHGlobalAnsi(s);
+                    Internal.addSymbols_0(__Instance, arg0);
+                    Marshal.FreeHGlobal(arg0);
+                }
+
                 public string FileName
                 {
                     get
@@ -6424,7 +6078,7 @@ namespace CppSharp
                 }
             }
 
-            public unsafe partial class ASTContext : IDisposable, CppSharp.Runtime.ICppMarshal
+            public unsafe partial class ASTContext : IDisposable
             {
                 [StructLayout(LayoutKind.Explicit, Size = 12)]
                 public struct Internal
@@ -6454,6 +6108,11 @@ namespace CppSharp
                         EntryPoint="?getTranslationUnits@ASTContext@AST@CppParser@CppSharp@@QAEPAUTranslationUnit@234@I@Z")]
                     internal static extern global::System.IntPtr getTranslationUnits_0(global::System.IntPtr instance, uint i);
 
+                    [SuppressUnmanagedCodeSecurity]
+                    [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                        EntryPoint="?addTranslationUnits@ASTContext@AST@CppParser@CppSharp@@QAEXAAPAUTranslationUnit@234@@Z")]
+                    internal static extern void addTranslationUnits_0(global::System.IntPtr instance, global::System.IntPtr s);
+
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?getTranslationUnitsCount@ASTContext@AST@CppParser@CppSharp@@QAEIXZ")]
@@ -6462,19 +6121,6 @@ namespace CppSharp
 
                 public global::System.IntPtr __Instance { get; protected set; }
 
-                int CppSharp.Runtime.ICppMarshal.NativeDataSize
-                {
-                    get { return 12; }
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-                {
-                }
-
-                void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-                {
-                }
-
                 internal ASTContext(ASTContext.Internal* native)
                     : this(new global::System.IntPtr(native))
                 {
@@ -6523,6 +6169,12 @@ namespace CppSharp
                     return new CppSharp.Parser.AST.TranslationUnit(__ret);
                 }
 
+                public void addTranslationUnits(CppSharp.Parser.AST.TranslationUnit s)
+                {
+                    var arg0 = s == (CppSharp.Parser.AST.TranslationUnit) null ? global::System.IntPtr.Zero : s.__Instance;
+                    Internal.addTranslationUnits_0(__Instance, arg0);
+                }
+
                 public uint TranslationUnitsCount
                 {
                     get
diff --git a/src/CppParser/Bindings/CSharp/CppParser.cs b/src/CppParser/Bindings/CSharp/CppParser.cs
index 6c197706..b74261f6 100644
--- a/src/CppParser/Bindings/CSharp/CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/CppParser.cs
@@ -35,7 +35,7 @@ namespace CppSharp
             User = 4
         }
 
-        public unsafe partial class ParserOptions : IDisposable, CppSharp.Runtime.ICppMarshal
+        public unsafe partial class ParserOptions : IDisposable
         {
             [StructLayout(LayoutKind.Explicit, Size = 112)]
             public struct Internal
@@ -159,19 +159,6 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            int CppSharp.Runtime.ICppMarshal.NativeDataSize
-            {
-                get { return 112; }
-            }
-
-            void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-            {
-            }
-
-            void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-            {
-            }
-
             internal ParserOptions(ParserOptions.Internal* native)
                 : this(new global::System.IntPtr(native))
             {
@@ -438,7 +425,7 @@ namespace CppSharp
             }
         }
 
-        public unsafe partial class ParserDiagnostic : IDisposable, CppSharp.Runtime.ICppMarshal
+        public unsafe partial class ParserDiagnostic : IDisposable
         {
             [StructLayout(LayoutKind.Explicit, Size = 60)]
             public struct Internal
@@ -490,19 +477,6 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            int CppSharp.Runtime.ICppMarshal.NativeDataSize
-            {
-                get { return 60; }
-            }
-
-            void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-            {
-            }
-
-            void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-            {
-            }
-
             internal ParserDiagnostic(ParserDiagnostic.Internal* native)
                 : this(new global::System.IntPtr(native))
             {
@@ -616,7 +590,7 @@ namespace CppSharp
             }
         }
 
-        public unsafe partial class ParserResult : IDisposable, CppSharp.Runtime.ICppMarshal
+        public unsafe partial class ParserResult : IDisposable
         {
             [StructLayout(LayoutKind.Explicit, Size = 24)]
             public struct Internal
@@ -633,7 +607,7 @@ namespace CppSharp
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                     EntryPoint="??0ParserResult@CppParser@CppSharp@@QAE@XZ")]
-                internal static extern global::System.IntPtr ctor_1(global::System.IntPtr instance);
+                internal static extern global::System.IntPtr ctor_0(global::System.IntPtr instance);
 
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -652,7 +626,7 @@ namespace CppSharp
 
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                    EntryPoint="?addDiagnostics@ParserResult@CppParser@CppSharp@@QAEXABUParserDiagnostic@23@@Z")]
+                    EntryPoint="?addDiagnostics@ParserResult@CppParser@CppSharp@@QAEXAAUParserDiagnostic@23@@Z")]
                 internal static extern void addDiagnostics_0(global::System.IntPtr instance, global::System.IntPtr s);
 
                 [SuppressUnmanagedCodeSecurity]
@@ -663,19 +637,6 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            int CppSharp.Runtime.ICppMarshal.NativeDataSize
-            {
-                get { return 24; }
-            }
-
-            void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-            {
-            }
-
-            void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-            {
-            }
-
             internal ParserResult(ParserResult.Internal* native)
                 : this(new global::System.IntPtr(native))
             {
@@ -694,7 +655,7 @@ namespace CppSharp
             public ParserResult()
             {
                 __Instance = Marshal.AllocHGlobal(24);
-                Internal.ctor_1(__Instance);
+                Internal.ctor_0(__Instance);
             }
 
             public void Dispose()
@@ -781,7 +742,7 @@ namespace CppSharp
             }
         }
 
-        public unsafe partial class ClangParser : IDisposable, CppSharp.Runtime.ICppMarshal
+        public unsafe partial class ClangParser : IDisposable
         {
             [StructLayout(LayoutKind.Explicit, Size = 1)]
             public struct Internal
@@ -804,19 +765,6 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            int CppSharp.Runtime.ICppMarshal.NativeDataSize
-            {
-                get { return 0; }
-            }
-
-            void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-            {
-            }
-
-            void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-            {
-            }
-
             internal ClangParser(ClangParser.Internal* native)
                 : this(new global::System.IntPtr(native))
             {