Move to ViewModel injection