Added classes for S3
Building a generic compatibility kit