This would be something perfect for the contract overhaul idea allowing you to pick and choose.
Hope we see these soon, maybe with ZRH?