Added extra ENV VARs