I can see that you put in some code towards this goal, but I just wanted to open a feature request so this does not end up forgotten.