Updated MvvM