Added proper env name and checks