Added support for Z3 and Passport