MVVM more updates