Hey Andrea Boriero, this is the issue I created for that work. I did my changes, and all this has been pushed to master. Thanks for your work on this!