Add support for env vars