I have created a patch to extend this functionality. Please review.
Thanks!