Some changes to view model