AWS and S3 plugins added