Updated calls to notifyChange to include eventType