Added option to force watch to use polling