Adding feature matching