Adding support for env and hostname