Reorganised ViewModel structure