Yeah, beyond scope of this PR I think. I'll create an issue.