Well, I have no figure around this, and vivien is already okay with the current form. I'll merge it this way, but you are free to open a new bug if we hit performances issues :)