added ENV support