Add better brute force matching