Added support for ENV and VAR replacements