Poller changes to add more context.