further tidy up of INotify on DataManager