Better support for ViewModels