Rework (fix) @att_all collection
Add grade to tables