Add polling support