Added view model support