Builder updates