ViewModel improvements.