Make C# compiler work with the new structure.