Add better match function.