Poller support
Updated notes