Adding var env check