Should I create a PR for this or do you want to do some more thinking about where or how it might be more appropriate to do this?