Refactor the notification bundle