Added the environment API