Adding support for env