Updated result matching