first commit for poller and hosted backends