Added auto set ENVIRONMENT