Class attr rework