Few changes for envVar post