diff --git a/src/Pure.DI.Core/Features/Default.g.cs b/src/Pure.DI.Core/Features/Default.g.cs
index d2670ece9..b334fadeb 100644
--- a/src/Pure.DI.Core/Features/Default.g.cs
+++ b/src/Pure.DI.Core/Features/Default.g.cs
@@ -287,7 +287,20 @@ private static void Setup()
 #if NET6_0_OR_GREATER
                 .Bind<global::System.Random>().To(_ => global::System.Random.Shared)
 #endif
-                    ;
+#if NETCOREAPP2_0 || NET || NETSTANDARD2_0_OR_GREATER                
+                .Bind<global::System.Text.Encoding>().To(_ => global::System.Text.Encoding.Default)
+#endif
+                .Bind<global::System.Text.Decoder>().To(ctx =>
+                {
+                    ctx.Inject(out global::System.Text.Encoding encoding);
+                    return encoding.GetDecoder();
+                })
+                .Bind<global::System.Text.Encoder>().To(ctx =>
+                {
+                    ctx.Inject(out global::System.Text.Encoding encoding);
+                    return encoding.GetEncoder();
+                })
+;
         }
     }
 }