[MOD] class attributes became instance attributes