Improved template for attachment. Organized output for metadata
Merge branch 'attach'