More MVVM updates