Refactor and notification persistance