Currently writing a v2 with a structure like Julien proposed.

Greetings,
Maxime.