Refactored Notification object model