Updates for env