Refactored the change notification into an event