Updated Admin & Manager view model