Added support for password auth