Ported IMF manager changes for C#