Changes to view model to account for model changes