Updated support scripts