CSharp: Improvements