Unfortunately, we may have a problem here. I'm not sure we can change existing preauth plugin interfaces in the 1.6 time frame. I understand that we did not commit to a public API, so we definitely could change them for 1.7. However I think we do have vendors who are depending on at least the existing interfaces being somewhat stable for 1.6.