Notifications refactorization.