Update in line with Passport refactor.