Updated with view model