Added AutoUpdate mode