add default polling handling