Make polling use handler