[FIX] TO REMOVE BEFORE PR !!!
[M] Doc refacto
[D] Use custom builder