Added support for password strings