Update for interface changes.