Adding separate step to setup environment variables.