Mvvm enhancements