Updated Builder logic