Added querying of environment veriable