OK, I've added them in. No deprecation warning at this point, but I may add one after I do the performance work.