In fact, I think it should be expanded to some other crimes.
I am however against the country club environment in many of our prisons. Disconnect the tv sets. Get rid of the internet. The old prisons had farms and were self sustainable. Now prisoners are just parasites on the taxpayers.