Refactored notifications