Added support for Passport