Updates to view model resolver api