Update way to fetch env