Changed the object overrides