Refactor/new notification config