viewmodel upgrades except page and pageObjects