Update for interpreter signature change