Added envvar resolving for variables