Adding poll support