Final steps for conversion to .NET