Basic changes for S3
Initial code