diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
index bc996523..6e4f9c0e 100644
--- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
@@ -251,9 +251,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.NativeLibrary.__Internal*) __Instance)->fileName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -1076,9 +1074,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BlockCommandComment.Argument.__Internal*) __Instance)->text));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -1622,9 +1618,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.VerbatimBlockLineComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -1900,9 +1894,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.VerbatimLineComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2081,9 +2073,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.InlineCommandComment.Argument.__Internal*) __Instance)->text));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2470,9 +2460,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.Attribute.__Internal*) __Instance)->name));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2486,9 +2474,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.Attribute.__Internal*) __Instance)->value));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2590,9 +2576,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.__Internal*) __Instance)->tagName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2713,9 +2697,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLEndTagComment.__Internal*) __Instance)->tagName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2827,9 +2809,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.TextComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2966,9 +2946,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.RawComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2982,9 +2960,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.RawComment.__Internal*) __Instance)->briefText));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -5740,9 +5716,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.DependentNameType.__Internal*) __Instance)->identifier));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6694,9 +6668,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6710,9 +6682,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->USR));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6726,9 +6696,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->debugText));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -8370,9 +8338,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StatementObsolete.__Internal*) __Instance)->@string));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -8642,9 +8608,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BinaryOperatorObsolete.__Internal*) __Instance)->opcodeStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9667,9 +9631,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->mangled));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9683,9 +9645,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->signature));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9699,9 +9659,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->body));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -10581,9 +10539,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Enumeration.Item.__Internal*) __Instance)->expression));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -10931,9 +10887,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Variable.__Internal*) __Instance)->mangled));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -12066,9 +12020,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.LayoutField.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16798,9 +16750,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroDefinition.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16814,9 +16764,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroDefinition.__Internal*) __Instance)->expression));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16963,9 +16911,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroExpansion.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16979,9 +16925,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroExpansion.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -17252,9 +17196,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.TranslationUnit.__Internal*) __Instance)->fileName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -21253,9 +21195,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.GCCAsmStmt.AsmStringPiece.__Internal*) __Instance)->@string));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -21555,9 +21495,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MSAsmStmt.__Internal*) __Instance)->asmString));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -26486,9 +26424,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StringLiteral.__Internal*) __Instance)->@string));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -26502,9 +26438,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StringLiteral.__Internal*) __Instance)->bytes));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -29918,9 +29852,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BinaryOperator.__Internal*) __Instance)->opcodeStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -38577,9 +38509,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.CXXUuidofExpr.__Internal*) __Instance)->uuidStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -46636,9 +46566,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserTargetInfo.__Internal*) __Instance)->ABI));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47739,9 +47667,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->libraryFile));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47786,9 +47712,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetTriple));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47802,9 +47726,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->currentDir));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -48107,9 +48029,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserDiagnostic.__Internal*) __Instance)->fileName));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -48123,9 +48043,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserDiagnostic.__Internal*) __Instance)->message));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs
index c3317024..f6c03492 100644
--- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs
+++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs
@@ -700,11 +700,6 @@ namespace Std
                 EntryPoint="_ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC2Ev")]
             internal static extern void ctorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C(global::System.IntPtr __instance);
 
-            [SuppressUnmanagedCodeSecurity]
-            [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                EntryPoint="_ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC2ERKS5_")]
-            internal static extern void cctorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C(global::System.IntPtr __instance, global::System.IntPtr __str);
-
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                 EntryPoint="_ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEED2Ev")]
@@ -717,8 +712,8 @@ namespace Std
 
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                EntryPoint="_ZNKSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5c_strEv")]
-            internal static extern global::System.IntPtr CStrc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C(global::System.IntPtr __instance);
+                EntryPoint="_ZNKSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE4dataEv")]
+            internal static extern global::System.IntPtr Datac__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C(global::System.IntPtr __instance);
         }
 
         namespace Rep
@@ -829,7 +824,7 @@ namespace Std
         private static void* __CopyValue(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C native)
         {
             var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C));
-            global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C.cctorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C(ret, new global::System.IntPtr(&native));
+            *(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C*) ret = native;
             return ret.ToPointer();
         }
 
@@ -863,25 +858,6 @@ namespace Std
             throw new ArgumentOutOfRangeException("_CharT, _Traits, _Allocator", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Allocator).FullName }), "global::Std.BasicString<_CharT, _Traits, _Allocator> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
         }
 
-        public BasicString(global::Std.BasicString<_CharT, _Traits, _Allocator> __str)
-        {
-            var ___CharT = typeof(_CharT);
-            var ___Traits = typeof(_Traits);
-            var ___Allocator = typeof(_Allocator);
-            if (___CharT.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Allocator.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
-            {
-                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C));
-                __ownsNativeInstance = true;
-                NativeToManagedMap[__Instance] = this;
-                if (ReferenceEquals(__str, null))
-                    throw new global::System.ArgumentNullException("__str", "Cannot be null because it is a C++ reference (&).");
-                var __arg0 = __str.__Instance;
-                global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C.cctorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C((__Instance + __PointerAdjustment), __arg0);
-                return;
-            }
-            throw new ArgumentOutOfRangeException("_CharT, _Traits, _Allocator", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Allocator).FullName }), "global::Std.BasicString<_CharT, _Traits, _Allocator> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
-        }
-
         public void Dispose()
         {
             Dispose(disposing: true);
@@ -990,7 +966,7 @@ namespace Std
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                 EntryPoint="_ZNKSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5c_strEv")]
-            internal static extern global::System.IntPtr CStr(global::System.IntPtr __instance);
+            internal static extern global::System.IntPtr Data(global::System.IntPtr __instance);
         }
 
         public static global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> Assign(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this, string __s)
@@ -1005,10 +981,10 @@ namespace Std
             return __result0;
         }
 
-        public static string CStr(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this)
+        public static string Data(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this)
         {
             var __arg0 = ReferenceEquals(@this, null) ? global::System.IntPtr.Zero : @this.__Instance;
-            var __ret = __Internal.CStr(__arg0);
+            var __ret = __Internal.Data(__arg0);
             return Marshal.PtrToStringAnsi(__ret);
         }
     }
diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
index 63fb382a..8adcdccb 100644
--- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
@@ -251,9 +251,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.NativeLibrary.__Internal*) __Instance)->fileName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -1076,9 +1074,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BlockCommandComment.Argument.__Internal*) __Instance)->text));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -1622,9 +1618,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.VerbatimBlockLineComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -1900,9 +1894,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.VerbatimLineComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2081,9 +2073,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.InlineCommandComment.Argument.__Internal*) __Instance)->text));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2470,9 +2460,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.Attribute.__Internal*) __Instance)->name));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2486,9 +2474,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.Attribute.__Internal*) __Instance)->value));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2590,9 +2576,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.__Internal*) __Instance)->tagName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2713,9 +2697,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLEndTagComment.__Internal*) __Instance)->tagName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2827,9 +2809,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.TextComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2966,9 +2946,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.RawComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2982,9 +2960,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.RawComment.__Internal*) __Instance)->briefText));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -5740,9 +5716,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.DependentNameType.__Internal*) __Instance)->identifier));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6694,9 +6668,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6710,9 +6682,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->USR));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6726,9 +6696,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->debugText));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -8370,9 +8338,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StatementObsolete.__Internal*) __Instance)->@string));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -8642,9 +8608,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BinaryOperatorObsolete.__Internal*) __Instance)->opcodeStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9667,9 +9631,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->mangled));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9683,9 +9645,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->signature));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9699,9 +9659,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->body));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -10581,9 +10539,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Enumeration.Item.__Internal*) __Instance)->expression));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -10931,9 +10887,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Variable.__Internal*) __Instance)->mangled));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -12066,9 +12020,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.LayoutField.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16798,9 +16750,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroDefinition.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16814,9 +16764,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroDefinition.__Internal*) __Instance)->expression));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16963,9 +16911,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroExpansion.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16979,9 +16925,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroExpansion.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -17252,9 +17196,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.TranslationUnit.__Internal*) __Instance)->fileName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -21253,9 +21195,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.GCCAsmStmt.AsmStringPiece.__Internal*) __Instance)->@string));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -21555,9 +21495,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MSAsmStmt.__Internal*) __Instance)->asmString));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -26486,9 +26424,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StringLiteral.__Internal*) __Instance)->@string));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -26502,9 +26438,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StringLiteral.__Internal*) __Instance)->bytes));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -29918,9 +29852,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BinaryOperator.__Internal*) __Instance)->opcodeStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -38577,9 +38509,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.CXXUuidofExpr.__Internal*) __Instance)->uuidStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -46636,9 +46566,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserTargetInfo.__Internal*) __Instance)->ABI));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47739,9 +47667,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->libraryFile));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47786,9 +47712,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetTriple));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47802,9 +47726,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->currentDir));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -48107,9 +48029,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserDiagnostic.__Internal*) __Instance)->fileName));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -48123,9 +48043,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserDiagnostic.__Internal*) __Instance)->message));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
index 6bdf55e5..bd36c85c 100644
--- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
+++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
@@ -455,17 +455,6 @@ namespace Std
             throw new ArgumentOutOfRangeException("_Ty", string.Join(", ", new[] { typeof(_Ty).FullName }), "global::Std.Allocator<_Ty> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte>.");
         }
 
-        public Allocator(global::Std.Allocator<_Ty> _0)
-        {
-            var ___Ty = typeof(_Ty);
-            if (___Ty.IsAssignableFrom(typeof(sbyte)))
-            {
-                throw new MissingMethodException("Method allocator__Ty_ missing from explicit specialization global::Std.Allocator<sbyte>.");
-                return;
-            }
-            throw new ArgumentOutOfRangeException("_Ty", string.Join(", ", new[] { typeof(_Ty).FullName }), "global::Std.Allocator<_Ty> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte>.");
-        }
-
         public void Dispose()
         {
             Dispose(disposing: true);
@@ -494,11 +483,6 @@ namespace Std
             [FieldOffset(0)]
             internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator__C___N_std_S__String_val____N_std_S__Simple_types__C_Vb1 _Mypair;
 
-            [SuppressUnmanagedCodeSecurity]
-            [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                EntryPoint="??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z")]
-            internal static extern global::System.IntPtr cctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance, global::System.IntPtr _Right);
-
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                 EntryPoint="??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ")]
@@ -511,8 +495,8 @@ namespace Std
 
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                EntryPoint="?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ")]
-            internal static extern global::System.IntPtr CStrc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance);
+                EntryPoint="?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ")]
+            internal static extern global::System.IntPtr Datac__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance);
         }
     }
 
@@ -539,7 +523,7 @@ namespace Std
         private static void* __CopyValue(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native)
         {
             var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
-            global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.cctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(ret, new global::System.IntPtr(&native));
+            *(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C*) ret = native;
             return ret.ToPointer();
         }
 
@@ -557,25 +541,6 @@ namespace Std
             __Instance = new global::System.IntPtr(native);
         }
 
-        public BasicString(global::Std.BasicString<_Elem, _Traits, _Alloc> _Right)
-        {
-            var ___Elem = typeof(_Elem);
-            var ___Traits = typeof(_Traits);
-            var ___Alloc = typeof(_Alloc);
-            if (___Elem.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Alloc.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
-            {
-                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
-                __ownsNativeInstance = true;
-                NativeToManagedMap[__Instance] = this;
-                if (ReferenceEquals(_Right, null))
-                    throw new global::System.ArgumentNullException("_Right", "Cannot be null because it is a C++ reference (&).");
-                var __arg0 = _Right.__Instance;
-                global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.cctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment), __arg0);
-                return;
-            }
-            throw new ArgumentOutOfRangeException("_Elem, _Traits, _Alloc", string.Join(", ", new[] { typeof(_Elem).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.BasicString<_Elem, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
-        }
-
         public BasicString()
         {
             var ___Elem = typeof(_Elem);
@@ -666,8 +631,8 @@ namespace Std
 
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
-                EntryPoint="?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ")]
-            internal static extern global::System.IntPtr CStr(global::System.IntPtr __instance);
+                EntryPoint="?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ")]
+            internal static extern global::System.IntPtr Data(global::System.IntPtr __instance);
         }
 
         public static global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> Assign(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this, string _Ptr)
@@ -682,10 +647,10 @@ namespace Std
             return __result0;
         }
 
-        public static string CStr(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this)
+        public static string Data(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this)
         {
             var __arg0 = ReferenceEquals(@this, null) ? global::System.IntPtr.Zero : @this.__Instance;
-            var __ret = __Internal.CStr(__arg0);
+            var __ret = __Internal.Data(__arg0);
             if (__ret == global::System.IntPtr.Zero)
                 return default(string);
             var __retPtr = (byte*) __ret;
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
index e9be001f..2aef82cf 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
@@ -251,9 +251,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.NativeLibrary.__Internal*) __Instance)->fileName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -1076,9 +1074,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BlockCommandComment.Argument.__Internal*) __Instance)->text));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -1622,9 +1618,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.VerbatimBlockLineComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -1900,9 +1894,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.VerbatimLineComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2081,9 +2073,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.InlineCommandComment.Argument.__Internal*) __Instance)->text));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2470,9 +2460,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.Attribute.__Internal*) __Instance)->name));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2486,9 +2474,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.Attribute.__Internal*) __Instance)->value));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2590,9 +2576,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.__Internal*) __Instance)->tagName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2713,9 +2697,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLEndTagComment.__Internal*) __Instance)->tagName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2827,9 +2809,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.TextComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2966,9 +2946,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.RawComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2982,9 +2960,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.RawComment.__Internal*) __Instance)->briefText));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -5740,9 +5716,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.DependentNameType.__Internal*) __Instance)->identifier));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6694,9 +6668,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6710,9 +6682,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->USR));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6726,9 +6696,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->debugText));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -8370,9 +8338,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StatementObsolete.__Internal*) __Instance)->@string));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -8642,9 +8608,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BinaryOperatorObsolete.__Internal*) __Instance)->opcodeStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9667,9 +9631,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->mangled));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9683,9 +9645,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->signature));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9699,9 +9659,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->body));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -10581,9 +10539,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Enumeration.Item.__Internal*) __Instance)->expression));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -10931,9 +10887,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Variable.__Internal*) __Instance)->mangled));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -12065,9 +12019,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.LayoutField.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16797,9 +16749,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroDefinition.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16813,9 +16763,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroDefinition.__Internal*) __Instance)->expression));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16962,9 +16910,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroExpansion.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16978,9 +16924,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroExpansion.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -17251,9 +17195,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.TranslationUnit.__Internal*) __Instance)->fileName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -21252,9 +21194,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.GCCAsmStmt.AsmStringPiece.__Internal*) __Instance)->@string));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -21554,9 +21494,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MSAsmStmt.__Internal*) __Instance)->asmString));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -26485,9 +26423,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StringLiteral.__Internal*) __Instance)->@string));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -26501,9 +26437,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StringLiteral.__Internal*) __Instance)->bytes));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -29917,9 +29851,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BinaryOperator.__Internal*) __Instance)->opcodeStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -38576,9 +38508,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.CXXUuidofExpr.__Internal*) __Instance)->uuidStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -46635,9 +46565,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserTargetInfo.__Internal*) __Instance)->ABI));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47738,9 +47666,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->libraryFile));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47785,9 +47711,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetTriple));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47801,9 +47725,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->currentDir));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -48106,9 +48028,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserDiagnostic.__Internal*) __Instance)->fileName));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -48122,9 +48042,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserDiagnostic.__Internal*) __Instance)->message));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs
index 5341d68b..12432ec7 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs
@@ -700,11 +700,6 @@ namespace Std
                 EntryPoint="_ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC2Ev")]
             internal static extern void ctorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C(global::System.IntPtr __instance);
 
-            [SuppressUnmanagedCodeSecurity]
-            [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                EntryPoint="_ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC2ERKS5_")]
-            internal static extern void cctorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C(global::System.IntPtr __instance, global::System.IntPtr __str);
-
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                 EntryPoint="_ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEED2Ev")]
@@ -717,8 +712,8 @@ namespace Std
 
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                EntryPoint="_ZNKSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5c_strEv")]
-            internal static extern global::System.IntPtr CStrc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C(global::System.IntPtr __instance);
+                EntryPoint="_ZNKSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE4dataEv")]
+            internal static extern global::System.IntPtr Datac__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C(global::System.IntPtr __instance);
         }
 
         namespace Rep
@@ -829,7 +824,7 @@ namespace Std
         private static void* __CopyValue(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C native)
         {
             var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C));
-            global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C.cctorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C(ret, new global::System.IntPtr(&native));
+            *(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C*) ret = native;
             return ret.ToPointer();
         }
 
@@ -863,25 +858,6 @@ namespace Std
             throw new ArgumentOutOfRangeException("_CharT, _Traits, _Allocator", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Allocator).FullName }), "global::Std.BasicString<_CharT, _Traits, _Allocator> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
         }
 
-        public BasicString(global::Std.BasicString<_CharT, _Traits, _Allocator> __str)
-        {
-            var ___CharT = typeof(_CharT);
-            var ___Traits = typeof(_Traits);
-            var ___Allocator = typeof(_Allocator);
-            if (___CharT.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Allocator.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
-            {
-                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C));
-                __ownsNativeInstance = true;
-                NativeToManagedMap[__Instance] = this;
-                if (ReferenceEquals(__str, null))
-                    throw new global::System.ArgumentNullException("__str", "Cannot be null because it is a C++ reference (&).");
-                var __arg0 = __str.__Instance;
-                global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C.cctorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C((__Instance + __PointerAdjustment), __arg0);
-                return;
-            }
-            throw new ArgumentOutOfRangeException("_CharT, _Traits, _Allocator", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Allocator).FullName }), "global::Std.BasicString<_CharT, _Traits, _Allocator> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
-        }
-
         public void Dispose()
         {
             Dispose(disposing: true);
@@ -990,7 +966,7 @@ namespace Std
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                 EntryPoint="_ZNKSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5c_strEv")]
-            internal static extern global::System.IntPtr CStr(global::System.IntPtr __instance);
+            internal static extern global::System.IntPtr Data(global::System.IntPtr __instance);
         }
 
         public static global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> Assign(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this, string __s)
@@ -1005,10 +981,10 @@ namespace Std
             return __result0;
         }
 
-        public static string CStr(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this)
+        public static string Data(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this)
         {
             var __arg0 = ReferenceEquals(@this, null) ? global::System.IntPtr.Zero : @this.__Instance;
-            var __ret = __Internal.CStr(__arg0);
+            var __ret = __Internal.Data(__arg0);
             return Marshal.PtrToStringAnsi(__ret);
         }
     }
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
index 46c4c6ad..ecd75bec 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
@@ -251,9 +251,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.NativeLibrary.__Internal*) __Instance)->fileName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -1076,9 +1074,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BlockCommandComment.Argument.__Internal*) __Instance)->text));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -1622,9 +1618,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.VerbatimBlockLineComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -1900,9 +1894,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.VerbatimLineComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2081,9 +2073,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.InlineCommandComment.Argument.__Internal*) __Instance)->text));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2470,9 +2460,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.Attribute.__Internal*) __Instance)->name));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2486,9 +2474,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.Attribute.__Internal*) __Instance)->value));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2590,9 +2576,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.__Internal*) __Instance)->tagName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2713,9 +2697,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLEndTagComment.__Internal*) __Instance)->tagName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2827,9 +2809,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.TextComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2966,9 +2946,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.RawComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2982,9 +2960,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.RawComment.__Internal*) __Instance)->briefText));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -5740,9 +5716,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.DependentNameType.__Internal*) __Instance)->identifier));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6694,9 +6668,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6710,9 +6682,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->USR));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6726,9 +6696,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->debugText));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -8370,9 +8338,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StatementObsolete.__Internal*) __Instance)->@string));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -8642,9 +8608,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BinaryOperatorObsolete.__Internal*) __Instance)->opcodeStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9667,9 +9631,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->mangled));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9683,9 +9645,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->signature));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9699,9 +9659,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->body));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -10581,9 +10539,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Enumeration.Item.__Internal*) __Instance)->expression));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -10931,9 +10887,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Variable.__Internal*) __Instance)->mangled));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -12065,9 +12019,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.LayoutField.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16797,9 +16749,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroDefinition.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16813,9 +16763,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroDefinition.__Internal*) __Instance)->expression));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16962,9 +16910,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroExpansion.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16978,9 +16924,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroExpansion.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -17251,9 +17195,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.TranslationUnit.__Internal*) __Instance)->fileName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -21252,9 +21194,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.GCCAsmStmt.AsmStringPiece.__Internal*) __Instance)->@string));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -21554,9 +21494,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MSAsmStmt.__Internal*) __Instance)->asmString));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -26485,9 +26423,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StringLiteral.__Internal*) __Instance)->@string));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -26501,9 +26437,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StringLiteral.__Internal*) __Instance)->bytes));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -29917,9 +29851,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BinaryOperator.__Internal*) __Instance)->opcodeStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -38576,9 +38508,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.CXXUuidofExpr.__Internal*) __Instance)->uuidStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -46635,9 +46565,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserTargetInfo.__Internal*) __Instance)->ABI));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47738,9 +47666,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->libraryFile));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47785,9 +47711,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetTriple));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47801,9 +47725,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->currentDir));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -48106,9 +48028,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserDiagnostic.__Internal*) __Instance)->fileName));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -48122,9 +48042,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserDiagnostic.__Internal*) __Instance)->message));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs
index 91eafdb0..27354b64 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs
@@ -25,11 +25,6 @@ namespace Std
                 EntryPoint="_ZNSaIcEC2Ev")]
             internal static extern void ctorc__N_std_S_allocator__C(global::System.IntPtr __instance);
 
-            [SuppressUnmanagedCodeSecurity]
-            [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                EntryPoint="_ZNSaIcEC2ERKS_")]
-            internal static extern void cctorc__N_std_S_allocator__C(global::System.IntPtr __instance, global::System.IntPtr __a);
-
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                 EntryPoint="_ZNSaIcED2Ev")]
@@ -60,7 +55,7 @@ namespace Std
         private static void* __CopyValue(global::Std.Allocator.__Internal native)
         {
             var ret = Marshal.AllocHGlobal(sizeof(global::Std.Allocator.__Internal));
-            global::Std.Allocator.__Internal.cctorc__N_std_S_allocator__C(ret, new global::System.IntPtr(&native));
+            *(global::Std.Allocator.__Internal*) ret = native;
             return ret.ToPointer();
         }
 
@@ -92,23 +87,6 @@ namespace Std
             throw new ArgumentOutOfRangeException("_Tp", string.Join(", ", new[] { typeof(_Tp).FullName }), "global::Std.Allocator<_Tp> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte>.");
         }
 
-        public Allocator(global::Std.Allocator<_Tp> __a)
-        {
-            var ___Tp = typeof(_Tp);
-            if (___Tp.IsAssignableFrom(typeof(sbyte)))
-            {
-                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.Allocator.__Internal));
-                __ownsNativeInstance = true;
-                NativeToManagedMap[__Instance] = this;
-                if (ReferenceEquals(__a, null))
-                    throw new global::System.ArgumentNullException("__a", "Cannot be null because it is a C++ reference (&).");
-                var __arg0 = __a.__Instance;
-                global::Std.Allocator.__Internal.cctorc__N_std_S_allocator__C((__Instance + __PointerAdjustment), __arg0);
-                return;
-            }
-            throw new ArgumentOutOfRangeException("_Tp", string.Join(", ", new[] { typeof(_Tp).FullName }), "global::Std.Allocator<_Tp> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte>.");
-        }
-
         public void Dispose()
         {
             Dispose(disposing: true);
@@ -886,11 +864,6 @@ namespace Std
                 EntryPoint="_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2Ev")]
             internal static extern void ctorc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance);
 
-            [SuppressUnmanagedCodeSecurity]
-            [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                EntryPoint="_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2ERKS4_")]
-            internal static extern void cctorc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance, global::System.IntPtr __str);
-
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                 EntryPoint="_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEED2Ev")]
@@ -898,8 +871,8 @@ namespace Std
 
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                EntryPoint="_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE5c_strEv")]
-            internal static extern global::System.IntPtr CStrc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance);
+                EntryPoint="_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4dataEv")]
+            internal static extern global::System.IntPtr Datac__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance);
         }
 
         namespace AllocHider
@@ -951,7 +924,7 @@ namespace Std
         private static void* __CopyValue(global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native)
         {
             var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
-            global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.cctorc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(ret, new global::System.IntPtr(&native));
+            *(global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C*) ret = native;
             return ret.ToPointer();
         }
 
@@ -985,25 +958,6 @@ namespace Std
             throw new ArgumentOutOfRangeException("_CharT, _Traits, _Alloc", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.BasicString<_CharT, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
         }
 
-        public BasicString(global::Std.BasicString<_CharT, _Traits, _Alloc> __str)
-        {
-            var ___CharT = typeof(_CharT);
-            var ___Traits = typeof(_Traits);
-            var ___Alloc = typeof(_Alloc);
-            if (___CharT.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Alloc.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
-            {
-                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
-                __ownsNativeInstance = true;
-                NativeToManagedMap[__Instance] = this;
-                if (ReferenceEquals(__str, null))
-                    throw new global::System.ArgumentNullException("__str", "Cannot be null because it is a C++ reference (&).");
-                var __arg0 = __str.__Instance;
-                global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.cctorc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment), __arg0);
-                return;
-            }
-            throw new ArgumentOutOfRangeException("_CharT, _Traits, _Alloc", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.BasicString<_CharT, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
-        }
-
         public void Dispose()
         {
             Dispose(disposing: true);
@@ -1045,8 +999,8 @@ namespace Std
 
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                EntryPoint="_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE5c_strEv")]
-            internal static extern global::System.IntPtr CStr(global::System.IntPtr __instance);
+                EntryPoint="_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4dataEv")]
+            internal static extern global::System.IntPtr Data(global::System.IntPtr __instance);
         }
 
         public static global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> Assign(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this, string __s)
@@ -1061,10 +1015,10 @@ namespace Std
             return __result0;
         }
 
-        public static string CStr(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this)
+        public static string Data(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this)
         {
             var __arg0 = ReferenceEquals(@this, null) ? global::System.IntPtr.Zero : @this.__Instance;
-            var __ret = __Internal.CStr(__arg0);
+            var __ret = __Internal.Data(__arg0);
             if (__ret == global::System.IntPtr.Zero)
                 return default(string);
             var __retPtr = (byte*) __ret;
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
index 7814dc72..83a26551 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
@@ -251,9 +251,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.NativeLibrary.__Internal*) __Instance)->fileName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -1076,9 +1074,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BlockCommandComment.Argument.__Internal*) __Instance)->text));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -1622,9 +1618,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.VerbatimBlockLineComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -1900,9 +1894,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.VerbatimLineComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2081,9 +2073,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.InlineCommandComment.Argument.__Internal*) __Instance)->text));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2470,9 +2460,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.Attribute.__Internal*) __Instance)->name));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2486,9 +2474,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.Attribute.__Internal*) __Instance)->value));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2590,9 +2576,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.__Internal*) __Instance)->tagName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2713,9 +2697,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLEndTagComment.__Internal*) __Instance)->tagName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2827,9 +2809,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.TextComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2966,9 +2946,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.RawComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2982,9 +2960,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.RawComment.__Internal*) __Instance)->briefText));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -5740,9 +5716,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.DependentNameType.__Internal*) __Instance)->identifier));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6694,9 +6668,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6710,9 +6682,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->USR));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6726,9 +6696,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->debugText));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -8370,9 +8338,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StatementObsolete.__Internal*) __Instance)->@string));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -8642,9 +8608,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BinaryOperatorObsolete.__Internal*) __Instance)->opcodeStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9667,9 +9631,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->mangled));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9683,9 +9645,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->signature));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9699,9 +9659,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->body));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -10581,9 +10539,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Enumeration.Item.__Internal*) __Instance)->expression));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -10931,9 +10887,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Variable.__Internal*) __Instance)->mangled));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -12065,9 +12019,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.LayoutField.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16797,9 +16749,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroDefinition.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16813,9 +16763,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroDefinition.__Internal*) __Instance)->expression));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16962,9 +16910,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroExpansion.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16978,9 +16924,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroExpansion.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -17251,9 +17195,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.TranslationUnit.__Internal*) __Instance)->fileName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -21252,9 +21194,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.GCCAsmStmt.AsmStringPiece.__Internal*) __Instance)->@string));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -21554,9 +21494,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MSAsmStmt.__Internal*) __Instance)->asmString));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -26485,9 +26423,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StringLiteral.__Internal*) __Instance)->@string));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -26501,9 +26437,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StringLiteral.__Internal*) __Instance)->bytes));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -29917,9 +29851,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BinaryOperator.__Internal*) __Instance)->opcodeStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -38576,9 +38508,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.CXXUuidofExpr.__Internal*) __Instance)->uuidStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -46635,9 +46565,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserTargetInfo.__Internal*) __Instance)->ABI));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47738,9 +47666,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->libraryFile));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47785,9 +47711,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetTriple));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47801,9 +47725,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->currentDir));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -48106,9 +48028,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserDiagnostic.__Internal*) __Instance)->fileName));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -48122,9 +48042,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserDiagnostic.__Internal*) __Instance)->message));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs
index 857caa3e..63d55224 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs
@@ -25,11 +25,6 @@ namespace Std
                 EntryPoint="_ZNSaIcEC2Ev")]
             internal static extern void ctorc__N_std_S_allocator__C(global::System.IntPtr __instance);
 
-            [SuppressUnmanagedCodeSecurity]
-            [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                EntryPoint="_ZNSaIcEC2ERKS_")]
-            internal static extern void cctorc__N_std_S_allocator__C(global::System.IntPtr __instance, global::System.IntPtr __a);
-
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                 EntryPoint="_ZNSaIcED2Ev")]
@@ -60,7 +55,7 @@ namespace Std
         private static void* __CopyValue(global::Std.Allocator.__Internal native)
         {
             var ret = Marshal.AllocHGlobal(sizeof(global::Std.Allocator.__Internal));
-            global::Std.Allocator.__Internal.cctorc__N_std_S_allocator__C(ret, new global::System.IntPtr(&native));
+            *(global::Std.Allocator.__Internal*) ret = native;
             return ret.ToPointer();
         }
 
@@ -92,23 +87,6 @@ namespace Std
             throw new ArgumentOutOfRangeException("_Tp", string.Join(", ", new[] { typeof(_Tp).FullName }), "global::Std.Allocator<_Tp> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte>.");
         }
 
-        public Allocator(global::Std.Allocator<_Tp> __a)
-        {
-            var ___Tp = typeof(_Tp);
-            if (___Tp.IsAssignableFrom(typeof(sbyte)))
-            {
-                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.Allocator.__Internal));
-                __ownsNativeInstance = true;
-                NativeToManagedMap[__Instance] = this;
-                if (ReferenceEquals(__a, null))
-                    throw new global::System.ArgumentNullException("__a", "Cannot be null because it is a C++ reference (&).");
-                var __arg0 = __a.__Instance;
-                global::Std.Allocator.__Internal.cctorc__N_std_S_allocator__C((__Instance + __PointerAdjustment), __arg0);
-                return;
-            }
-            throw new ArgumentOutOfRangeException("_Tp", string.Join(", ", new[] { typeof(_Tp).FullName }), "global::Std.Allocator<_Tp> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte>.");
-        }
-
         public void Dispose()
         {
             Dispose(disposing: true);
@@ -877,11 +855,6 @@ namespace Std
                 EntryPoint="_ZNSsC2Ev")]
             internal static extern void ctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance);
 
-            [SuppressUnmanagedCodeSecurity]
-            [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                EntryPoint="_ZNSsC2ERKSs")]
-            internal static extern void cctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance, global::System.IntPtr __str);
-
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                 EntryPoint="_ZNSsD2Ev")]
@@ -889,8 +862,8 @@ namespace Std
 
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                EntryPoint="_ZNKSs5c_strEv")]
-            internal static extern global::System.IntPtr CStrc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance);
+                EntryPoint="_ZNKSs4dataEv")]
+            internal static extern global::System.IntPtr Datac__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance);
         }
 
         namespace AllocHider
@@ -928,7 +901,7 @@ namespace Std
         private static void* __CopyValue(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native)
         {
             var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
-            global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.cctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(ret, new global::System.IntPtr(&native));
+            *(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C*) ret = native;
             return ret.ToPointer();
         }
 
@@ -962,25 +935,6 @@ namespace Std
             throw new ArgumentOutOfRangeException("_CharT, _Traits, _Alloc", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.BasicString<_CharT, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
         }
 
-        public BasicString(global::Std.BasicString<_CharT, _Traits, _Alloc> __str)
-        {
-            var ___CharT = typeof(_CharT);
-            var ___Traits = typeof(_Traits);
-            var ___Alloc = typeof(_Alloc);
-            if (___CharT.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Alloc.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
-            {
-                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
-                __ownsNativeInstance = true;
-                NativeToManagedMap[__Instance] = this;
-                if (ReferenceEquals(__str, null))
-                    throw new global::System.ArgumentNullException("__str", "Cannot be null because it is a C++ reference (&).");
-                var __arg0 = __str.__Instance;
-                global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.cctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment), __arg0);
-                return;
-            }
-            throw new ArgumentOutOfRangeException("_CharT, _Traits, _Alloc", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.BasicString<_CharT, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
-        }
-
         public void Dispose()
         {
             Dispose(disposing: true);
@@ -1022,8 +976,8 @@ namespace Std
 
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                EntryPoint="_ZNKSs5c_strEv")]
-            internal static extern global::System.IntPtr CStr(global::System.IntPtr __instance);
+                EntryPoint="_ZNKSs4dataEv")]
+            internal static extern global::System.IntPtr Data(global::System.IntPtr __instance);
         }
 
         public static global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> Assign(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this, string __s)
@@ -1038,10 +992,10 @@ namespace Std
             return __result0;
         }
 
-        public static string CStr(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this)
+        public static string Data(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this)
         {
             var __arg0 = ReferenceEquals(@this, null) ? global::System.IntPtr.Zero : @this.__Instance;
-            var __ret = __Internal.CStr(__arg0);
+            var __ret = __Internal.Data(__arg0);
             if (__ret == global::System.IntPtr.Zero)
                 return default(string);
             var __retPtr = (byte*) __ret;
diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
index 89a52058..41ed8eaf 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
@@ -251,9 +251,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.NativeLibrary.__Internal*) __Instance)->fileName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -1076,9 +1074,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BlockCommandComment.Argument.__Internal*) __Instance)->text));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -1622,9 +1618,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.VerbatimBlockLineComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -1900,9 +1894,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.VerbatimLineComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2081,9 +2073,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.InlineCommandComment.Argument.__Internal*) __Instance)->text));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2470,9 +2460,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.Attribute.__Internal*) __Instance)->name));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2486,9 +2474,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.Attribute.__Internal*) __Instance)->value));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -2590,9 +2576,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLStartTagComment.__Internal*) __Instance)->tagName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2713,9 +2697,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.HTMLEndTagComment.__Internal*) __Instance)->tagName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2827,9 +2809,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.TextComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2966,9 +2946,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.RawComment.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -2982,9 +2960,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.RawComment.__Internal*) __Instance)->briefText));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -5740,9 +5716,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.DependentNameType.__Internal*) __Instance)->identifier));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6694,9 +6668,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6710,9 +6682,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->USR));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -6726,9 +6696,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Declaration.__Internal*) __Instance)->debugText));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -8370,9 +8338,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StatementObsolete.__Internal*) __Instance)->@string));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -8642,9 +8608,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BinaryOperatorObsolete.__Internal*) __Instance)->opcodeStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9667,9 +9631,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->mangled));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9683,9 +9645,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->signature));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -9699,9 +9659,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Function.__Internal*) __Instance)->body));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -10581,9 +10539,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Enumeration.Item.__Internal*) __Instance)->expression));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -10931,9 +10887,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.Variable.__Internal*) __Instance)->mangled));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -12066,9 +12020,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.LayoutField.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16798,9 +16750,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroDefinition.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16814,9 +16764,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroDefinition.__Internal*) __Instance)->expression));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16963,9 +16911,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroExpansion.__Internal*) __Instance)->name));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -16979,9 +16925,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MacroExpansion.__Internal*) __Instance)->text));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -17252,9 +17196,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.TranslationUnit.__Internal*) __Instance)->fileName));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -21253,9 +21195,7 @@ namespace CppSharp
                         get
                         {
                             var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.GCCAsmStmt.AsmStringPiece.__Internal*) __Instance)->@string));
-                            var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                            __basicStringRet0.Dispose(false);
-                            return __stringRet0;
+                            return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                         }
 
                         set
@@ -21555,9 +21495,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.MSAsmStmt.__Internal*) __Instance)->asmString));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -26486,9 +26424,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StringLiteral.__Internal*) __Instance)->@string));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -26502,9 +26438,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.StringLiteral.__Internal*) __Instance)->bytes));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -29918,9 +29852,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.BinaryOperator.__Internal*) __Instance)->opcodeStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -38577,9 +38509,7 @@ namespace CppSharp
                     get
                     {
                         var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.AST.CXXUuidofExpr.__Internal*) __Instance)->uuidStr));
-                        var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                        __basicStringRet0.Dispose(false);
-                        return __stringRet0;
+                        return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                     }
 
                     set
@@ -46636,9 +46566,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserTargetInfo.__Internal*) __Instance)->ABI));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47739,9 +47667,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->libraryFile));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47786,9 +47712,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetTriple));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -47802,9 +47726,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->currentDir));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -48107,9 +48029,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserDiagnostic.__Internal*) __Instance)->fileName));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
@@ -48123,9 +48043,7 @@ namespace CppSharp
                 get
                 {
                     var __basicStringRet0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(new global::System.IntPtr(&((global::CppSharp.Parser.ParserDiagnostic.__Internal*) __Instance)->message));
-                    var __stringRet0 = global::Std.BasicStringExtensions.CStr(__basicStringRet0);
-                    __basicStringRet0.Dispose(false);
-                    return __stringRet0;
+                    return global::Std.BasicStringExtensions.Data(__basicStringRet0);
                 }
 
                 set
diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
index 9ae20e00..64b29e6f 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
@@ -455,17 +455,6 @@ namespace Std
             throw new ArgumentOutOfRangeException("_Ty", string.Join(", ", new[] { typeof(_Ty).FullName }), "global::Std.Allocator<_Ty> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte>.");
         }
 
-        public Allocator(global::Std.Allocator<_Ty> _0)
-        {
-            var ___Ty = typeof(_Ty);
-            if (___Ty.IsAssignableFrom(typeof(sbyte)))
-            {
-                throw new MissingMethodException("Method allocator__Ty_ missing from explicit specialization global::Std.Allocator<sbyte>.");
-                return;
-            }
-            throw new ArgumentOutOfRangeException("_Ty", string.Join(", ", new[] { typeof(_Ty).FullName }), "global::Std.Allocator<_Ty> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte>.");
-        }
-
         public void Dispose()
         {
             Dispose(disposing: true);
@@ -494,11 +483,6 @@ namespace Std
             [FieldOffset(0)]
             internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator__C___N_std_S__String_val____N_std_S__Simple_types__C_Vb1 _Mypair;
 
-            [SuppressUnmanagedCodeSecurity]
-            [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                EntryPoint="??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@@Z")]
-            internal static extern global::System.IntPtr cctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance, global::System.IntPtr _Right);
-
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                 EntryPoint="??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ")]
@@ -511,8 +495,8 @@ namespace Std
 
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                EntryPoint="?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ")]
-            internal static extern global::System.IntPtr CStrc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance);
+                EntryPoint="?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ")]
+            internal static extern global::System.IntPtr Datac__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance);
         }
     }
 
@@ -539,7 +523,7 @@ namespace Std
         private static void* __CopyValue(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native)
         {
             var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
-            global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.cctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(ret, new global::System.IntPtr(&native));
+            *(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C*) ret = native;
             return ret.ToPointer();
         }
 
@@ -557,25 +541,6 @@ namespace Std
             __Instance = new global::System.IntPtr(native);
         }
 
-        public BasicString(global::Std.BasicString<_Elem, _Traits, _Alloc> _Right)
-        {
-            var ___Elem = typeof(_Elem);
-            var ___Traits = typeof(_Traits);
-            var ___Alloc = typeof(_Alloc);
-            if (___Elem.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Alloc.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
-            {
-                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
-                __ownsNativeInstance = true;
-                NativeToManagedMap[__Instance] = this;
-                if (ReferenceEquals(_Right, null))
-                    throw new global::System.ArgumentNullException("_Right", "Cannot be null because it is a C++ reference (&).");
-                var __arg0 = _Right.__Instance;
-                global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.cctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment), __arg0);
-                return;
-            }
-            throw new ArgumentOutOfRangeException("_Elem, _Traits, _Alloc", string.Join(", ", new[] { typeof(_Elem).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.BasicString<_Elem, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
-        }
-
         public BasicString()
         {
             var ___Elem = typeof(_Elem);
@@ -666,8 +631,8 @@ namespace Std
 
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                EntryPoint="?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ")]
-            internal static extern global::System.IntPtr CStr(global::System.IntPtr __instance);
+                EntryPoint="?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ")]
+            internal static extern global::System.IntPtr Data(global::System.IntPtr __instance);
         }
 
         public static global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> Assign(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this, string _Ptr)
@@ -682,10 +647,10 @@ namespace Std
             return __result0;
         }
 
-        public static string CStr(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this)
+        public static string Data(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this)
         {
             var __arg0 = ReferenceEquals(@this, null) ? global::System.IntPtr.Zero : @this.__Instance;
-            var __ret = __Internal.CStr(__arg0);
+            var __ret = __Internal.Data(__arg0);
             if (__ret == global::System.IntPtr.Zero)
                 return default(string);
             var __retPtr = (byte*) __ret;
diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp
index 5e0f4308..891faf59 100644
--- a/src/CppParser/Parser.cpp
+++ b/src/CppParser/Parser.cpp
@@ -931,8 +931,6 @@ bool Parser::IsSupported(const clang::CXXMethodDecl* MD)
 {
     using namespace clang;
 
-    auto CopyCtor = llvm::dyn_cast<CXXConstructorDecl>(MD);
-
     return !c->getSourceManager().isInSystemHeader(MD->getBeginLoc()) ||
         (isa<CXXConstructorDecl>(MD) && MD->getNumParams() == 0) ||
         isa<CXXDestructorDecl>(MD) ||