Added support for using ENV variables for credentials