Changes for instance attributes in ClassMaker