Improve publishing to S3
Improve metadata support