Add handling for INotifyPropertyChanged