Refacto of builder