Updated environment setup