Add class validation, add missing classes