Better matching for more cases