Refactoring with media bundle