adding classes for new structure of evaluation