Adding support for username, password and host parameters