Added support for a local file with username and password
Minor changes