Add Metadata and Helper