Add Metadata and Authentication