[M] Doc refacto
[D] Use custom builder