Added support for password