Maybe these guys are worth another PR. I am happy we have the options now upstream!