Add polling for great UX