Adapt new interfaces.