Alright, changed the issue from Bug to Feature request. If you would like to contribute a PR to support this, I'll happy to help.