Add Passport Support

Add Passport Support