Additional enhancements to the poller to add context flexibility.