Update for new interfaces.