Some changes in AbstractBuilder