Updates for media-legacy