Updates to .NET adapter