Yes, absolutely.
I would support such an amendment, and not only for those who have been convicted. There are people who have not been convicted, but have had repeated episodes of family violence, or attempted suicide. All of these elements have to be included, not only for those who were convicted, but also for those who are known to police and medical authorities. We should include all factors related to mental illness, whether schizophrenia or Alzheimer's, and not only family violence.