Refactored the poller mechanism
Refactored the poller mechanism