Added MVVM