Updated to handle changes to interfaces