Added envvars resolving for import from location