Adding s3 tokens