UpdateBuilder improvements