Removed the INotifyPropertyChanged for now