Add className support and multi thread search code