Add support for ENV variables