Media bundle refactor changes