Was added viewModels and some fix