Work in progress on .NET support