Some changes for csharp