added support for password