Improved ViewModel lifetime management