add match validation