Added username/password optiosn