Rework of the object class.