Added env properties on code