Added classification functionality