Add partial match support