@TomMalbran 
That was my plan, but I didn't mention it for this pull request since we can do it as next improvement rather than delay this.