Added support for PasswordType