MVVM changes