Added clas hints