Updated S3 class.