Updated envfit option