updated and added s3 plugin