Updated for external adaptor changes.