More Viewmodel changes