Changes for implementing PopulateTableDataCollectorsHandler and its unit
tests