Refactoring and resolve some bugs on NotifyBundle