Made changes for view model