Added checking environment