Added metadata and links