I'll sure do it once the discussion about this PR is finished and Leo will accept this feature ;)