Added s3 class