Updates to match new interfaces.