Updated in line with Passport refactor.