Added support for user and password