Improve matcher API