Sounds good to me. I'll update the patch accordingly.