Refactor de builders