Update for ENV/SERVER vars to work properly