Use builder instead of build