More work on PollHandler