Rewritten builder