Some improvment for match table