Refactoring for incluing a Notification class