Updating builder classes.