Added classification checker