Add support for CSharp