Move poller to seperate class