Added support for password type