Updated to handle interface changes