Add support for ENV config