Modifications made to support both real time and polling data collection