Improve ViewModel inits