Newsletter bundle refactor