Improving performance of the class analyzer