Update for interface change in code generator