Another adjustment about classes