Refactor MediaDataCollector