refacto(builder): new api proposal