Added back logic to get credentials from env variables