Optimize ClassTableMatch