Should be pretty easy to do.
I'd prefer however keeping this for another PR, once this one is merged.
What do you think ?