Move validators into the ViewModel