Issue: Should we add notifyChange()?