Add attribute matching