Added INotifyPropertyChanged support