additional c# code, apiflow fix