.NET improvements