Updated Builder API