Updated to use the new C# template