Updated media fields--added more flexibility