Datacollector class added
Moved functions from support to datacollector