refactoring media bundle