Added more relations to the metadata
Added the 'metadata' tag around the different metadata