Added classes for S3