Class rework