Simplify NewBuilder