Updated for interface changes