@beberlei Should @mnapoli update his PR with the code above?