Added shared poller, remove global sync