Added option to disable polling