Updated poller with multiple events