Refactor MediaDataCollectors