Added S3 encrypted file support from cschulte22