Work in progress (added TrafficPoller which need some optimizing)