Second order matcher added. Required API changes too.