Adding match conditions