added support for %ENV