Add Poller and some chaos