Updated to beta support of C#