refactor for new notification module
nofication module