Updates for refactored media bundle