Added support for passport
Updated changes