Updated passport functionality