Updated the Object class