Media Extraction Improvements