More poller dependencies
Merge branch 'working'