Renamed ViewModelBase to DataViewModelBase