Models\ and ViewModels\: additions and modifications