I think this is another good candidate for a separate PR since it should be applied across all models