Updated environmental variable referencing