additional parts of S3 integration added