Changes for implementing PopulateTableDataCollectorsHandler and unit
testing.