adding poll support