That was going to be my next question. I think we should depreceate and update any default generators to pass the new format.