Added match and thread validation