More ViewModels refractoring