move passport out of init