added amazon s3, ps templates