Updated environment APIs