Improve class_assignments partial