Added aws and s3 plugins