diff --git a/app/data/opends/annotation-termlist.csv b/app/data/opends/annotation-termlist.csv
index d45f3ff..7058a36 100644
--- a/app/data/opends/annotation-termlist.csv
+++ b/app/data/opends/annotation-termlist.csv
@@ -1,6 +1,7 @@
 namespace,term_local_name,label,definition,usage,notes,examples,rdf_type,class_name,is_required,is_repeatable,compound_name,namespace_iri,term_iri,term_ns_name,datatype
 ods:,Annotation,Annotation,Annotation model based on the W3C Web Annotation Data Model (https://www.w3.org/TR/annotation-model/),,,,http://www.w3.org/2000/01/rdf-schema#Class,Annotation,True,True,Annotation,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/Annotation,ods:Annotation,
 ods:,ID,Id,The handle of the annotation. It is a unique identifier for the annotation. It is composed of the handle of the document followed by a slash and a unique identifier for the annotation.,,,['https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,True,False,Annotation.ID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/ID,ods:ID,string
+ods:,status,Status,The status of the Digital Object.,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,False,False,Annotation.status,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/status,ods:status,
 ods:,jobID,Job Id,"Handle of the job record, if the annotation was produced by a Machine Annotation Service, only filled when annotation was created by a MAS",,,['https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,False,False,Annotation.jobID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/jobID,ods:jobID,string
 rdf:,type,Type,The type of the annotation. It is always ods:Annotation. https://www.w3.org/TR/rdf12-schema/#ch_type,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,True,False,Annotation.type,http://www.w3.org/1999/02/22-rdf-syntax-ns#,http://www.w3.org/1999/02/22-rdf-syntax-ns#type,rdf:type,string
 ods:,version,Version,"The version of the object, each change generates a new version",,,[1],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,True,False,Annotation.version,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/version,ods:version,integer
@@ -8,20 +9,35 @@ oa:,motivation,Motivation,The motivation for the annotation. Based on a selectio
 oa:,motivatedBy,Motivated By,Describes the reason for the annotation. https://www.w3.org/TR/annotation-vocab/#motivatedby,,,['The country is incorrect'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,False,False,Annotation.motivatedBy,http://www.w3.org/ns/oa#,http://www.w3.org/ns/oa#motivatedBy,oa:motivatedBy,string
 oa:,hasTarget,Has Target,Indicates the particular object and part of the object on which the annotation has been made.,,,,http://www.w3.org/2000/01/rdf-schema#Class,Annotation,True,False,Annotation.hasTarget,http://www.w3.org/ns/oa#,http://www.w3.org/ns/oa#hasTarget,oa:hasTarget,object
 ods:,ID,Id,"This is the PID of the target object. Valid targets are the Digital Specimen, Digital Media Object or another annotation.",,,"['https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX', 'https://doi.org/10.22/XXX-XXX-XXX']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,hasTarget,False,False,oa:hasTarget.ID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/ID,ods:ID,string
-ods:,type,Type,This is the handle to the type of the target object.,,,"['https://doi.org/21.T11148/bbad8c4e101e8af01115', 'https://doi.org/21.T11148/894b1e6cad57e921764e']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,hasTarget,False,False,oa:hasTarget.type,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/type,ods:type,string
+ods:,type,Type,This is the handle to the type of the target object.,,,"['https://doi.org/21.T11148/bbad8c4e101e8af01115', 'https://doi.org/21.T11148/894b1e6cad57e921764e']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,hasTarget,True,False,oa:hasTarget.type,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/type,ods:type,string
 oa:,hasSelector,Has Selector,"Optional field to indicate the part of the target object that is being annotated. It can be a field, a class or a region of interest.",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,hasTarget,False,False,oa:hasTarget.hasSelector,http://www.w3.org/ns/oa#,http://www.w3.org/ns/oa#hasSelector,oa:hasSelector,object
-oa:,hasBody,Has Body,The body of the annotation contains the specific value of the annotation,,,,http://www.w3.org/2000/01/rdf-schema#Class,Annotation,True,False,Annotation.hasBody,http://www.w3.org/ns/oa#,http://www.w3.org/ns/oa#hasBody,oa:hasBody,object
+oa:,hasBody,Has Body,The body of the annotation contains the specific value of the annotation,,,,http://www.w3.org/2000/01/rdf-schema#Class,Annotation,False,False,Annotation.hasBody,http://www.w3.org/ns/oa#,http://www.w3.org/ns/oa#hasBody,oa:hasBody,object
 oa:,value,Value,An array of multiple values in string representation specific for the particular selector,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,hasBody,True,False,oa:hasBody.value,http://www.w3.org/ns/oa#,http://www.w3.org/ns/oa#value,oa:value,array
 dcterms:,references,References,Indicates how the value came to be. https://purl.org/dc/terms/references,,,['https://api.gbif.org/v1/occurrence/search?occurrenceID=https://herbarium.bgbm.org/object/BW00965020&catalogNumber=B -W 00965 -02 0&basisOfRecord=PreservedSpecimen'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,hasBody,False,False,oa:hasBody.references,http://purl.org/dc/terms/,http://purl.org/dc/terms/references,dcterms:references,string
 ods:,score,Score,A score between 0 and 1 indicating the confidence in the value. 1 is the highest confidence and 0 is the lowest.,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,hasBody,False,False,oa:hasBody.score,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/score,ods:score,number
-dcterms:,creator,Creator,Object containing information on who created the object,,,,http://www.w3.org/2000/01/rdf-schema#Class,Annotation,True,False,Annotation.creator,http://purl.org/dc/terms/,http://purl.org/dc/terms/creator,dcterms:creator,object
-foaf:,name,Name,The name of the creator. http://xmlns.com/foaf/0.1/#term_name,,,['Gbif linker service'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,creator,False,False,dcterms:creator.name,http://xmlns.com/foaf/0.1/,http://xmlns.com/foaf/0.1/name,foaf:name,string
+dcterms:,creator,Creator,Contains an ods:Agent object,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,True,False,Annotation.creator,http://purl.org/dc/terms/,http://purl.org/dc/terms/creator,dcterms:creator,object
 dcterms:,created,Created,The date and time when the annotation was created. https://purl.org/dc/terms/created,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,True,False,Annotation.created,http://purl.org/dc/terms/,http://purl.org/dc/terms/created,dcterms:created,string
-ods:,dateTombstoned,Date Tombstoned,Timestamp Annotation was tombstoned and no longer active. Generated on request of the user. Empty as long as Annotation is active,,,['2021-06-01T12:00:000Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,False,False,Annotation.dateTombstoned,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/dateTombstoned,ods:dateTombstoned,string
-dcterms:,issued,Issued,The date and time when the annotation was generated. https://purl.org/dc/terms/issued,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,False,False,Annotation.issued,http://purl.org/dc/terms/,http://purl.org/dc/terms/issued,dcterms:issued,string
-as:,generator,Generator,Object containing information on who generated the object. Generated is here seen as who stored/indexed the object. In most case this will be the annotation-processing-service,,,,http://www.w3.org/2000/01/rdf-schema#Class,Annotation,True,False,Annotation.generator,http://www.w3.org/ns/activitystreams#,http://www.w3.org/ns/activitystreams#generator,as:generator,object
-foaf:,name,Name,The name of the creator. http://xmlns.com/foaf/0.1/#term_name,,,['Gbif linker service'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,generator,False,False,as:generator.name,http://xmlns.com/foaf/0.1/,http://xmlns.com/foaf/0.1/name,foaf:name,string
+dcterms:,issued,Issued,The date and time when the annotation was generated. https://purl.org/dc/terms/issued,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,True,False,Annotation.issued,http://purl.org/dc/terms/,http://purl.org/dc/terms/issued,dcterms:issued,string
+as:,generator,Generator,Object containing information on who generated the object. Generated is here seen as who stored/indexed the object. In most case this will be the annotation-processing-service. Contains an ods:Agent object.,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,True,False,Annotation.generator,http://www.w3.org/ns/activitystreams#,http://www.w3.org/ns/activitystreams#generator,as:generator,object
 schema:,AggregateRating,Aggregate Rating,The average rating based on multiple ratings or reviews,,,,http://www.w3.org/2000/01/rdf-schema#Class,Annotation,False,False,Annotation.AggregateRating,http://schema.org/,http://schema.org/AggregateRating,schema:AggregateRating,object
 schema:,ratingCount,Rating Count,The count of total number of ratings. https://schema.org/ratingCount,,,[3],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,AggregateRating,True,False,schema:AggregateRating.ratingCount,http://schema.org/,http://schema.org/ratingCount,schema:ratingCount,integer
 schema:,ratingValue,Rating Value,The rating for the content. https://schema.org/ratingValue,,,[4.5],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,AggregateRating,True,False,schema:AggregateRating.ratingValue,http://schema.org/,http://schema.org/ratingValue,schema:ratingValue,number
 ods:,batchID,Batch Id,Internally generated PID to identify the batch the annotation was generated by,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,False,False,Annotation.batchID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/batchID,ods:batchID,string
+ods:,mergingDecisionStatus,Merging Decision Status,The merging status of the annotation. Only present when motivation is ods:adding or oa:editing,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,False,False,Annotation.mergingDecisionStatus,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/mergingDecisionStatus,ods:mergingDecisionStatus,
+ods:,mergingStateChangeDate,Merging State Change Date,The date and time when the annotation was merging state was changed. Only present when motivation is ods:adding or oa:editing,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,False,False,Annotation.mergingStateChangeDate,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/mergingStateChangeDate,ods:mergingStateChangeDate,string
+ods:,MergingStateChangedBy,Merging State Changed By,Object containing information on who changed the merging state of the annotation. Only present when motivation is ods:adding or oa:editing. Contains an ods:Agent object.,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,False,False,Annotation.MergingStateChangedBy,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/MergingStateChangedBy,ods:MergingStateChangedBy,object
+ods:,TombstoneMetadata,Tombstone Metadata,Object containing the tombstone metadata of the object. Only present when ods:status is ods:Tombstone,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Annotation,False,False,Annotation.TombstoneMetadata,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstoneMetadata,ods:TombstoneMetadata,object
+ods:,TombstoneMetadata,Tombstone Metadata,The tombstone metadata about the tombstoned digital object,,,,http://www.w3.org/2000/01/rdf-schema#Class,TombstoneMetadata,False,True,TombstoneMetadata,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstoneMetadata,ods:TombstoneMetadata,
+ods:,tombstonedDate,Tombstoned Date,Timestamp the Digital Object was tombstoned and no longer active.,,,['2021-06-01T12:00:000Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.tombstonedDate,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/tombstonedDate,ods:tombstonedDate,string
+ods:,tombstonedText,Tombstoned Text,A reason why the Digital Object was tombstoned,,,"['This is a duplicate of XXX', 'This object was made by mistake']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.tombstonedText,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/tombstonedText,ods:tombstonedText,string
+ods:,TombstonedByAgent,Tombstoned By Agent,"The agent who tombstoned the object, contains an ods:Agent object",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.TombstonedByAgent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstonedByAgent,ods:TombstonedByAgent,object
+ods:,hasRelatedPID,Has Related Pid,The PIDs of the object the tombstoned object is related to,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,False,False,TombstoneMetadata.hasRelatedPID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasRelatedPID,ods:hasRelatedPID,array
+ods:,Agent,Agent,Description of the agents connected to the digital object,,,,http://www.w3.org/2000/01/rdf-schema#Class,Agent,False,True,Agent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/Agent,ods:Agent,
+schema:,name,Name,Full name of the agent,,,['John Smith'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,True,False,Agent.name,http://schema.org/,http://schema.org/name,schema:name,string
+schema:,roleName,Role Name,"Indicates the role of the agent, https://schema.org/roleName",,,"['collector', 'preparer', 'identifier', 'recorder']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.roleName,http://schema.org/,http://schema.org/roleName,schema:roleName,string
+schema:,startDate,Start Date,Date the agent began the role,,,['2023-10-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.startDate,http://schema.org/,http://schema.org/startDate,schema:startDate,string
+schema:,endDate,End Date,Date the agent ended the role,,,['2023-09-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.endDate,http://schema.org/,http://schema.org/endDate,schema:endDate,string
+ods:,roleOrder,Role Order,Order of the agent in the role. Can be used to indicate the order of importance,,,"[1, 2]",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.roleOrder,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/roleOrder,ods:roleOrder,integer
+schema:,email,Email,"Email of the agent, can be present in case the agent is a maintainer of a MAS",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.email,http://schema.org/,http://schema.org/email,schema:email,string
+schema:,url,Url,"URL of the agent, can be present in case the agent is a maintainer of a MAS",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.url,http://schema.org/,http://schema.org/url,schema:url,string
+ods:,hasIdentifier,Has Identifier,Contains zero or more ods:Identifier objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.hasIdentifier,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasIdentifier,ods:hasIdentifier,array
diff --git a/app/data/opends/create-update-tombstone-event-termlist.csv b/app/data/opends/create-update-tombstone-event-termlist.csv
index 650d072..eee2077 100644
--- a/app/data/opends/create-update-tombstone-event-termlist.csv
+++ b/app/data/opends/create-update-tombstone-event-termlist.csv
@@ -3,7 +3,7 @@ ods:,CreateUpdateTombstoneEvent,Create Update Tombstone Event,"Create Update Tom
 ods:,ID,Id,"The unique identifier of the Create Update Tombstone Event, this includes the version of the object",,,"['https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX/3', 'https://doi.org/TEST/PGD-QGK-S0R/1']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,CreateUpdateTombstoneEvent,False,False,CreateUpdateTombstoneEvent.ID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/ID,ods:ID,string
 ods:,type,Type,The DOI to the FDO type of the object,,,['https://doi.org/10.15468/1a2b3c'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,CreateUpdateTombstoneEvent,False,False,CreateUpdateTombstoneEvent.type,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/type,ods:type,string
 prov:,Activity,Activity,"Based on the prov-ontology Activity Class, https://www.w3.org/ns/prov#Activity",,,,http://www.w3.org/2000/01/rdf-schema#Class,CreateUpdateTombstoneEvent,False,False,CreateUpdateTombstoneEvent.Activity,,Activity,prov:Activity,object
-prov:,wasAssociatedWith,Was Associated With,"The unique identifier of the prov:Agent that was associated with the Activity (as indicated at @id in the Activity Class), http://www.w3.org/ns/prov#wasAssociatedWith",,,"['https://orcid.org/0000-0002-1825-0097', 'https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Activity,True,False,prov:Activity.wasAssociatedWith,,wasAssociatedWith,prov:wasAssociatedWith,string
+prov:,wasAssociatedWith,Was Associated With,Contains zero a reference to one or more prov:Agent objects that were associated with the Activity,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Activity,True,False,prov:Activity.wasAssociatedWith,,wasAssociatedWith,prov:wasAssociatedWith,array
 prov:,endedAtTime,Ended At Time,"The date and time when the activity ended, in ISO 8601 format, http://www.w3.org/ns/prov#endedAtTime",,,['2024-06-11T09:14:001Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Activity,True,False,prov:Activity.endedAtTime,,endedAtTime,prov:endedAtTime,string
 prov:,used,Used,"The unique identifier of the prov:Entity that was used in the Activity (as indicated at @id in the Activity Class), http://www.w3.org/ns/prov#used",,,"['https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX/1', 'https://doi.org/10.15468/1a2b3c/3']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Activity,True,False,prov:Activity.used,,used,prov:used,string
 rdfs:,comment,Comment,"A comment about the activity, https://www.w3.org/2000/01/rdf-schema#comment",,,['This activity was created by the user'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Activity,False,False,prov:Activity.comment,http://www.w3.org/2000/01/rdf-schema#,http://www.w3.org/2000/01/rdf-schema#comment,rdfs:comment,string
@@ -12,6 +12,13 @@ prov:,Entity,Entity,"Based on the prov-ontology Entity Class, https://www.w3.org
 prov:,value,Value,"The full object that is the result of the prov:Activity, the structure of this object is defined by the `@type` field. When the `prov:Activity` is of type `ods:Tombstone`, this field is empty",,,"[{'@id': 'https://hdl.handle.net/20.5000.1025/ABC-DEF-GHI', '@type': 'ods:Mapping', 'ods:ID': 'https://hdl.handle.net/20.5000.1025/ABC-DEF-GHI', 'ods:type': 'https://doi.org/10.15468/1a2b3c', 'schema:version': 1, 'schema:name': 'Default Mapping for Herbarium of University of Coimbra (COI)', 'schema:description': 'The default mapping for the Herbarium of the University of Coimbra (COI) to the Darwin Core standard.', 'schema:dateCreated': '2021-06-01T12:00:00Z', 'ods:creator': 'e2befba6-9324-4bb4-9f41-d7dfae4a44b0', 'ods:Mapping': {'ods:DefaultMapping': [{'ods:physicalSpecimenIdType': 'cetaf'}, {'ods:type': 'ZoologyVertebrateSpecimen'}, {'ods:organisationId': 'https://ror.org/05xg72x27'}], 'ods:FieldMapping': [{'ods:physicalSpecimenId': 'dwc:catalogNumber'}]}, 'ods:mappingDataStandard': 'dwc'}]",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Entity,False,False,prov:Entity.value,,value,prov:value,object
 prov:,wasRevisionOf,Was Revision Of,"The unique identifier (handle) of the previous version of the object, only present when prov:Activity is of type ods:Update and ods:Tombstone",,,['https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX/1'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Entity,False,False,prov:Entity.wasRevisionOf,,wasRevisionOf,prov:wasRevisionOf,string
 prov:,wasGeneratedBy,Was Generated By,"The unique identifier of the prov:Activity that generated the Entity (as indicated at @id in the Activity Class), http://www.w3.org/ns/prov#wasGeneratedBy",,,"['7ba628d4-2e28-4ce4-ad1e-e99c97c20507', '807f145c-11a1-41f0-af34-b2d7c580bcc1']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Entity,True,False,prov:Entity.wasGeneratedBy,,wasGeneratedBy,prov:wasGeneratedBy,string
-prov:,wasAttributedTo,Was Attributed To,"The unique identifier of the prov:Agent that was attributed to the Entity (as indicated at @id in the Agent Class), http://www.w3.org/ns/prov#wasAttributedTo",,,"['https://orcid.org/0000-0002-1825-0097', 'https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Entity,True,False,prov:Entity.wasAttributedTo,,wasAttributedTo,prov:wasAttributedTo,string
-prov:,Agent,Agent,"Based on the prov-ontology Agent Class, https://www.w3.org/ns/prov#Agent",,,,http://www.w3.org/2000/01/rdf-schema#Class,CreateUpdateTombstoneEvent,False,False,CreateUpdateTombstoneEvent.Agent,,Agent,prov:Agent,object
-foaf:,name,Name,The name of the agent,,,"['John Doe', 'GBIF Linker Service']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,True,False,prov:Agent.name,http://xmlns.com/foaf/0.1/,http://xmlns.com/foaf/0.1/name,foaf:name,string
+ods:,hasProvAgent,Has Prov Agent,Contains zero or more prov:Agent objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,CreateUpdateTombstoneEvent,False,False,CreateUpdateTombstoneEvent.hasProvAgent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasProvAgent,ods:hasProvAgent,array
+ods:,Agent,Agent,Description of the agents connected to the digital object,,,,http://www.w3.org/2000/01/rdf-schema#Class,Agent,False,True,Agent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/Agent,ods:Agent,
+schema:,name,Name,Full name of the agent,,,['John Smith'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,True,False,Agent.name,http://schema.org/,http://schema.org/name,schema:name,string
+schema:,roleName,Role Name,"Indicates the role of the agent, https://schema.org/roleName",,,"['collector', 'preparer', 'identifier', 'recorder']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.roleName,http://schema.org/,http://schema.org/roleName,schema:roleName,string
+schema:,startDate,Start Date,Date the agent began the role,,,['2023-10-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.startDate,http://schema.org/,http://schema.org/startDate,schema:startDate,string
+schema:,endDate,End Date,Date the agent ended the role,,,['2023-09-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.endDate,http://schema.org/,http://schema.org/endDate,schema:endDate,string
+ods:,roleOrder,Role Order,Order of the agent in the role. Can be used to indicate the order of importance,,,"[1, 2]",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.roleOrder,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/roleOrder,ods:roleOrder,integer
+schema:,email,Email,"Email of the agent, can be present in case the agent is a maintainer of a MAS",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.email,http://schema.org/,http://schema.org/email,schema:email,string
+schema:,url,Url,"URL of the agent, can be present in case the agent is a maintainer of a MAS",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.url,http://schema.org/,http://schema.org/url,schema:url,string
+ods:,hasIdentifier,Has Identifier,Contains zero or more ods:Identifier objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.hasIdentifier,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasIdentifier,ods:hasIdentifier,array
diff --git a/app/data/opends/data-mapping-termlist.csv b/app/data/opends/data-mapping-termlist.csv
index 7f3301f..c828098 100644
--- a/app/data/opends/data-mapping-termlist.csv
+++ b/app/data/opends/data-mapping-termlist.csv
@@ -2,12 +2,27 @@ namespace,term_local_name,label,definition,usage,notes,examples,rdf_type,class_n
 ods:,Mapping,Mapping,"Mapping data model, used for data-mapping between different data models",,,,http://www.w3.org/2000/01/rdf-schema#Class,Mapping,True,True,Mapping,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/Mapping,ods:Mapping,
 ods:,ID,Id,Handle of the Mapping,,,['https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Mapping,True,False,Mapping.ID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/ID,ods:ID,string
 ods:,type,Type,The DOI to the FDO type of the object,,,['https://doi.org/10.15468/1a2b3c'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Mapping,True,False,Mapping.type,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/type,ods:type,string
+ods:,status,Status,The status of the Digital Object,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Mapping,False,False,Mapping.status,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/status,ods:status,
 schema:,version,Version,"Version of the Mapping, https://schema.org/version",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Mapping,True,False,Mapping.version,http://schema.org/,http://schema.org/version,schema:version,integer
-schema:,name,Name,"Name of the Mapping as provided by the user, https://schema.org/name",,,['Default Mapping for Herbarium of University of Coimbra (COI)'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Mapping,False,False,Mapping.name,http://schema.org/,http://schema.org/name,schema:name,string
+schema:,name,Name,"Name of the Mapping as provided by the user, https://schema.org/name",,,['Default Mapping for Herbarium of University of Coimbra (COI)'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Mapping,True,False,Mapping.name,http://schema.org/,http://schema.org/name,schema:name,string
 schema:,description,Description,"Description of the Mapping as provided by the user, https://schema.org/description",,,['The default mapping for the Herbarium of the University of Coimbra (COI) to the Darwin Core standard.'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Mapping,False,False,Mapping.description,http://schema.org/,http://schema.org/description,schema:description,string
 schema:,dateCreated,Date Created,"Timestamp of creation. Internally generated, https://schema.org/dateCreated",,,['2021-06-01T12:00:000Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Mapping,True,False,Mapping.dateCreated,http://schema.org/,http://schema.org/dateCreated,schema:dateCreated,string
-ods:,dateTombstoned,Date Tombstoned,Timestamp Mapping was tombstoned and no longer active. Generated on request of the user,,,['2021-06-01T12:00:000Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Mapping,False,False,Mapping.dateTombstoned,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/dateTombstoned,ods:dateTombstoned,string
-ods:,creator,Creator,The internal user ID of the creator of the Mapping,,,['e2befba6-9324-4bb4-9f41-d7dfae4a44b0'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Mapping,True,False,Mapping.creator,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/creator,ods:creator,string
+schema:,creator,Creator,Contains an ods:Agent object,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Mapping,True,False,Mapping.creator,http://schema.org/,http://schema.org/creator,schema:creator,object
 ods:,DefaultMapping,Default Mapping,"A mapping object setting default values for ods terms. These default mappings will be set for each record in the dataset. Key is the ods term, value the default value to use",,,"[[{'ods:physicalSpecimenIdType': 'cetaf'}, {'ods:type': 'ZoologyVertebrateSpecimen'}, {'ods:organisationId': 'https://ror.org/05xg72x27'}]]",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Mapping,False,False,Mapping.DefaultMapping,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/DefaultMapping,ods:DefaultMapping,array
 ods:,FieldMapping,Field Mapping,"Setting an explicit mapping for an ods term to a term from the incoming dataset. Key is the ods term, value the incoming data standard term",,,[[{'ods:physicalSpecimenId': 'dwc:catalogNumber'}]],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Mapping,False,False,Mapping.FieldMapping,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/FieldMapping,ods:FieldMapping,array
 ods:,mappingDataStandard,Mapping Data Standard,Type of data standard we are mapping to,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Mapping,True,False,Mapping.mappingDataStandard,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/mappingDataStandard,ods:mappingDataStandard,
+ods:,TombstoneMetadata,Tombstone Metadata,Object containing the tombstone metadata of the object. Only present when ods:status is ods:Tombstone,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Mapping,False,False,Mapping.TombstoneMetadata,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstoneMetadata,ods:TombstoneMetadata,object
+ods:,TombstoneMetadata,Tombstone Metadata,The tombstone metadata about the tombstoned digital object,,,,http://www.w3.org/2000/01/rdf-schema#Class,TombstoneMetadata,False,True,TombstoneMetadata,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstoneMetadata,ods:TombstoneMetadata,
+ods:,tombstonedDate,Tombstoned Date,Timestamp the Digital Object was tombstoned and no longer active.,,,['2021-06-01T12:00:000Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.tombstonedDate,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/tombstonedDate,ods:tombstonedDate,string
+ods:,tombstonedText,Tombstoned Text,A reason why the Digital Object was tombstoned,,,"['This is a duplicate of XXX', 'This object was made by mistake']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.tombstonedText,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/tombstonedText,ods:tombstonedText,string
+ods:,TombstonedByAgent,Tombstoned By Agent,"The agent who tombstoned the object, contains an ods:Agent object",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.TombstonedByAgent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstonedByAgent,ods:TombstonedByAgent,object
+ods:,hasRelatedPID,Has Related Pid,The PIDs of the object the tombstoned object is related to,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,False,False,TombstoneMetadata.hasRelatedPID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasRelatedPID,ods:hasRelatedPID,array
+ods:,Agent,Agent,Description of the agents connected to the digital object,,,,http://www.w3.org/2000/01/rdf-schema#Class,Agent,False,True,Agent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/Agent,ods:Agent,
+schema:,name,Name,Full name of the agent,,,['John Smith'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.name,http://schema.org/,http://schema.org/name,schema:name,string
+schema:,roleName,Role Name,"Indicates the role of the agent, https://schema.org/roleName",,,"['collector', 'preparer', 'identifier', 'recorder']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.roleName,http://schema.org/,http://schema.org/roleName,schema:roleName,string
+schema:,startDate,Start Date,Date the agent began the role,,,['2023-10-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.startDate,http://schema.org/,http://schema.org/startDate,schema:startDate,string
+schema:,endDate,End Date,Date the agent ended the role,,,['2023-09-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.endDate,http://schema.org/,http://schema.org/endDate,schema:endDate,string
+ods:,roleOrder,Role Order,Order of the agent in the role. Can be used to indicate the order of importance,,,"[1, 2]",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.roleOrder,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/roleOrder,ods:roleOrder,integer
+schema:,email,Email,"Email of the agent, can be present in case the agent is a maintainer of a MAS",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.email,http://schema.org/,http://schema.org/email,schema:email,string
+schema:,url,Url,"URL of the agent, can be present in case the agent is a maintainer of a MAS",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.url,http://schema.org/,http://schema.org/url,schema:url,string
+ods:,hasIdentifier,Has Identifier,Contains zero or more ods:Identifier objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.hasIdentifier,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasIdentifier,ods:hasIdentifier,array
diff --git a/app/data/opends/digital-media-termlist.csv b/app/data/opends/digital-media-termlist.csv
index ecf6548..04f4136 100644
--- a/app/data/opends/digital-media-termlist.csv
+++ b/app/data/opends/digital-media-termlist.csv
@@ -2,12 +2,13 @@ namespace,term_local_name,label,definition,usage,notes,examples,rdf_type,class_n
 ods:,DigitalMedia,Digital Media,A digital representation of an media object such as a Image or Sound Recording,,,,http://www.w3.org/2000/01/rdf-schema#Class,DigitalMedia,True,True,DigitalMedia,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/DigitalMedia,ods:DigitalMedia,
 ods:,ID,Id,The unique digital identifier of the object,,,['https://hdl.handle.net.org/20.5000.1025/XXX-XXX-XXX'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,True,False,DigitalMedia.ID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/ID,ods:ID,string
 ods:,version,Version,"The version of the object, each change generates a new version",,,[1],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,True,False,DigitalMedia.version,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/version,ods:version,integer
+ods:,status,Status,The status of the Digital Object,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,False,False,DigitalMedia.status,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/status,ods:status,
 ods:,created,Created,The timestamp that the object version was created in DiSSCo,,,[],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,True,False,DigitalMedia.created,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/created,ods:created,string
 ods:,type,Type,The DOI to the FDO type of the object,,,['https://doi.org/10.15468/1a2b3c'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,False,False,DigitalMedia.type,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/type,ods:type,string
 dcterms:,type,Type,https://purl.org/dc/terms/type,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,False,False,DigitalMedia.type,http://purl.org/dc/terms/,http://purl.org/dc/terms/type,dcterms:type,
 ac:,accessURI,Access Uri,https://rs.tdwg.org/ac/terms/accessURI,,,[],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,True,False,DigitalMedia.accessURI,http://rs.tdwg.org/ac/terms/,http://rs.tdwg.org/ac/terms/accessURI,ac:accessURI,string
-dwc:,institutionID,Institution Id,"ROR or Wikidata identifier, based on https://rs.tdwg.org/dwc/terms/institutionID",,,['https://ror.org/015hz7p22'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,False,False,DigitalMedia.institutionID,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/institutionID,dwc:institutionID,string
-ods:,institutionName,Institution Name,Full museum name according to ROR or Wikidata,,,['National Museum of Natural History'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,False,False,DigitalMedia.institutionName,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/institutionName,ods:institutionName,string
+ods:,organisationID,Organisation Id,ROR or Wikidata identifie of the organisation,,,['https://ror.org/015hz7p22'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,False,False,DigitalMedia.organisationID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/organisationID,ods:organisationID,string
+ods:,organisationName,Organisation Name,Full museum name according to ROR or Wikidata,,,['National Museum of Natural History'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,False,False,DigitalMedia.organisationName,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/organisationName,ods:organisationName,string
 dcterms:,format,Format,https://purl.org/dc/terms/format,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,False,False,DigitalMedia.format,http://purl.org/dc/terms/,http://purl.org/dc/terms/format,dcterms:format,string
 dcterms:,license,License,https://purl.org/dc/terms/license,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,False,False,DigitalMedia.license,http://purl.org/dc/terms/,http://purl.org/dc/terms/license,dcterms:license,string
 dcterms:,description,Description,https://purl.org/dc/terms/description,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,False,False,DigitalMedia.description,http://purl.org/dc/terms/,http://purl.org/dc/terms/description,dcterms:description,string
@@ -23,14 +24,15 @@ ods:,hasCitation,Has Citation,Contains zero or more ods:Citation objects,,,,http
 ods:,hasIdentifier,Has Identifier,Contains zero or more ods:Identifier objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,False,False,DigitalMedia.hasIdentifier,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasIdentifier,ods:hasIdentifier,array
 ods:,hasEntityRelationship,Has Entity Relationship,Contains zero or more ods:EntityRelationship objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,False,False,DigitalMedia.hasEntityRelationship,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasEntityRelationship,ods:hasEntityRelationship,array
 ods:,hasAgent,Has Agent,Contains zero or more ods:Agent objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,False,False,DigitalMedia.hasAgent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasAgent,ods:hasAgent,array
+ods:,TombstoneMetadata,Tombstone Metadata,Object containing the tombstone metadata of the object. Only present when ods:status is ods:Tombstone,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalMedia,False,False,DigitalMedia.TombstoneMetadata,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstoneMetadata,ods:TombstoneMetadata,object
 ods:,Agent,Agent,The Agent of the digital specimen,,,,http://www.w3.org/2000/01/rdf-schema#Class,Agent,False,True,Agent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/Agent,ods:Agent,
-ods:,agentRole,Agent Role,Indicates the role of the agent,,,"['collector', 'preparer', 'identifier', 'recorder']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,True,False,Agent.agentRole,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/agentRole,ods:agentRole,string
-ods:,agentType,Agent Type,Indicates the type of agent,,,"['machine', 'human', 'organisation']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,True,False,Agent.agentType,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/agentType,ods:agentType,string
-ods:,agentID,Agent Id,"Primary identifier of the agent, additional identifiers can go in the identifiers array",,,['https://orcid.org/0000-0002-1825-0097'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.agentID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/agentID,ods:agentID,string
-ods:,agentName,Agent Name,Full name of the agent,,,['John Smith'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,True,False,Agent.agentName,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/agentName,ods:agentName,string
-ods:,agentRoleBegan,Agent Role Began,Date the agent began the role,,,['2023-10-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.agentRoleBegan,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/agentRoleBegan,ods:agentRoleBegan,string
-ods:,agentRoleEnded,Agent Role Ended,Date the agent ended the role,,,['2023-09-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.agentRoleEnded,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/agentRoleEnded,ods:agentRoleEnded,string
-ods:,agentRoleOrder,Agent Role Order,Order of the agent in the role. Can be used to indicate the order of importance,,,"[1, 2]",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.agentRoleOrder,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/agentRoleOrder,ods:agentRoleOrder,integer
+schema:,name,Name,Full name of the agent,,,['John Smith'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,True,False,Agent.name,http://schema.org/,http://schema.org/name,schema:name,string
+schema:,roleName,Role Name,"Indicates the role of the agent, https://schema.org/roleName",,,"['collector', 'preparer', 'identifier', 'recorder']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.roleName,http://schema.org/,http://schema.org/roleName,schema:roleName,string
+schema:,startDate,Start Date,Date the agent began the role,,,['2023-10-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.startDate,http://schema.org/,http://schema.org/startDate,schema:startDate,string
+schema:,endDate,End Date,Date the agent ended the role,,,['2023-09-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.endDate,http://schema.org/,http://schema.org/endDate,schema:endDate,string
+ods:,roleOrder,Role Order,Order of the agent in the role. Can be used to indicate the order of importance,,,"[1, 2]",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.roleOrder,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/roleOrder,ods:roleOrder,integer
+schema:,email,Email,"Email of the agent, can be present in case the agent is a maintainer of a MAS",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.email,http://schema.org/,http://schema.org/email,schema:email,string
+schema:,url,Url,"URL of the agent, can be present in case the agent is a maintainer of a MAS",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.url,http://schema.org/,http://schema.org/url,schema:url,string
 ods:,hasIdentifier,Has Identifier,Contains zero or more ods:Identifier objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.hasIdentifier,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasIdentifier,ods:hasIdentifier,array
 ods:,Assertion,Assertion,The Assertion of the digital specimen,,,,http://www.w3.org/2000/01/rdf-schema#Class,Assertion,False,True,Assertion,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/Assertion,ods:Assertion,
 dwc:,measurementID,Measurement Id,https://rs.tdwg.org/dwc/terms/measurementID,,,['9c752d22-b09a-11e8-96f8-529269fb1459'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.measurementID,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/measurementID,dwc:measurementID,string
@@ -43,8 +45,7 @@ dwciri:,measurementValue,Measurement Value,https://rs.tdwg.org/dwc/terms/measure
 dwc:,measurementAccuracy,Measurement Accuracy,https://rs.tdwg.org/dwc/terms/measurementAccuracy,,,"['0.1', 'normal distribution with variation of 2 m']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.measurementAccuracy,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/measurementAccuracy,dwc:measurementAccuracy,string
 dwc:,measurementUnit,Measurement Unit,https://rs.tdwg.org/dwc/terms/measurementUnit,,,"['m', 'cm']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.measurementUnit,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/measurementUnit,dwc:measurementUnit,string
 dwciri:,measurementUnit,Measurement Unit,https://rs.tdwg.org/dwc/iri/measurementUnit,,,['http://vocab.nerc.ac.uk/collection/P06/current/UMSQ/'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.measurementUnit,http://rs.tdwg.org/dwc/iri/,http://rs.tdwg.org/dwc/iri/measurementUnit,dwciri:measurementUnit,string
-ods:,assertionByAgentName,Assertion By Agent Name,Name of the agent who made the assertion,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.assertionByAgentName,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/assertionByAgentName,ods:assertionByAgentName,string
-ods:,assertionByAgentID,Assertion By Agent Id,"ID of the agent who made the assertion, recommended to be a ORCID or Wikidata identifier",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.assertionByAgentID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/assertionByAgentID,ods:assertionByAgentID,string
+ods:,AssertionByAgent,Assertion By Agent,"The agent who made the assertion, contains an ods:Agent object",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.AssertionByAgent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/AssertionByAgent,ods:AssertionByAgent,object
 ods:,assertionProtocol,Assertion Protocol,The protocol used to make the assertion,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.assertionProtocol,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/assertionProtocol,ods:assertionProtocol,string
 ods:,assertionProtocolID,Assertion Protocol Id,The ID of the protocol used to make the assertion,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.assertionProtocolID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/assertionProtocolID,ods:assertionProtocolID,string
 ods:,assertionRemarks,Assertion Remarks,Remarks about the assertion,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.assertionRemarks,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/assertionRemarks,ods:assertionRemarks,string
@@ -53,7 +54,7 @@ dcterms:,identifier,Identifier,https://purl.org/dc/terms/identifier,,,,http://ww
 dcterms:,type,Type,https://purl.org/dc/terms/type,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,False,False,Citation.type,http://purl.org/dc/terms/,http://purl.org/dc/terms/type,dcterms:type,string
 dcterms:,date,Date,https://purl.org/dc/terms/date,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,False,False,Citation.date,http://purl.org/dc/terms/,http://purl.org/dc/terms/date,dcterms:date,string
 dcterms:,title,Title,https://purl.org/dc/terms/title,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,True,False,Citation.title,http://purl.org/dc/terms/,http://purl.org/dc/terms/title,dcterms:title,string
-dcterms:,creator,Creator,https://purl.org/dc/elements/1.1/creator,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,False,False,Citation.creator,http://purl.org/dc/terms/,http://purl.org/dc/terms/creator,dcterms:creator,string
+dcterms:,creator,Creator,Contains an ods:Agent object,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,False,False,Citation.creator,http://purl.org/dc/terms/,http://purl.org/dc/terms/creator,dcterms:creator,object
 ods:,citationPageNumber,Citation Page Number,Page number of the citation,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,False,False,Citation.citationPageNumber,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/citationPageNumber,ods:citationPageNumber,string
 ods:,citationRemarks,Citation Remarks,Any further remarks about the citation,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,False,False,Citation.citationRemarks,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/citationRemarks,ods:citationRemarks,string
 ods:,referenceType,Reference Type,The type of reference,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,False,False,Citation.referenceType,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/referenceType,ods:referenceType,string
@@ -68,8 +69,8 @@ dwc:,relatedResourceID,Related Resource Id,https://rs.tdwg.org/dwc/terms/related
 ods:,relatedResourceURI,Related Resource Uri,The URI of the related resource,,,['https://www.gbif.org/occurrence/3024470157'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,EntityRelationship,False,False,EntityRelationship.relatedResourceURI,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/relatedResourceURI,ods:relatedResourceURI,string
 dwc:,relationshipEstablishedDate,Relationship Established Date,https://rs.tdwg.org/dwc/terms/relationshipEstablishedDate,,,['2024-05-30T09:46:20.120Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,EntityRelationship,False,False,EntityRelationship.relationshipEstablishedDate,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/relationshipEstablishedDate,dwc:relationshipEstablishedDate,string
 ods:,entityRelationshipOrder,Entity Relationship Order,When multiple relationships are added an order can be defined,,,[1],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,EntityRelationship,False,False,EntityRelationship.entityRelationshipOrder,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/entityRelationshipOrder,ods:entityRelationshipOrder,integer
+ods:,RelationshipAccordingToAgent,Relationship According To Agent,The agent who created the entity relationship. Contains an ods:Agent object,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,EntityRelationship,False,False,EntityRelationship.RelationshipAccordingToAgent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/RelationshipAccordingToAgent,ods:RelationshipAccordingToAgent,object
 dwc:,relationshipAccordingTo,Relationship According To,https://rs.tdwg.org/dwc/terms/relationshipAccordingTo,,,['Sam Leeflang'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,EntityRelationship,False,False,EntityRelationship.relationshipAccordingTo,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/relationshipAccordingTo,dwc:relationshipAccordingTo,string
-ods:,relationshipAccordingToID,Relationship According To Id,"The PID of the creator, this could be a Orcid(user), PID(machine) or ROR(organisation)",,,['https://orcid.org/0000-0002-5669-2769'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,EntityRelationship,False,False,EntityRelationship.relationshipAccordingToID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/relationshipAccordingToID,ods:relationshipAccordingToID,string
 dwc:,relationshipRemarks,Relationship Remarks,https://rs.tdwg.org/dwc/terms/relationshipRemarks,,,['Mother and offspring collected from the same nest'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,EntityRelationship,False,False,EntityRelationship.relationshipRemarks,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/relationshipRemarks,dwc:relationshipRemarks,string
 ods:,Identifier,Identifier,The Identifier of the digital specimen,,,,http://www.w3.org/2000/01/rdf-schema#Class,Identifier,False,True,Identifier,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/Identifier,ods:Identifier,
 dcterms:,title,Title,"The type of the identifier, https://purl.org/dc/elements/1.1/title",,,"['dwc:catalogueNumber', 'dwca:id']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Identifier,False,False,Identifier.title,http://purl.org/dc/terms/,http://purl.org/dc/terms/title,dcterms:title,string
@@ -80,3 +81,8 @@ dcterms:,subject,Subject,Keywords qualifying the identifier https://purl.org/dc/
 ods:,isPartOfLabel,Is Part Of Label,Indicates whether the identifier is part of the physical label,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Identifier,False,False,Identifier.isPartOfLabel,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/isPartOfLabel,ods:isPartOfLabel,boolean
 ods:,isBarcodeOrNFC,Is Barcode Or Nfc,Indicates whether the identifier is part of the barcode or nfc chip,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Identifier,False,False,Identifier.isBarcodeOrNFC,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/isBarcodeOrNFC,ods:isBarcodeOrNFC,boolean
 ods:,isIDPersistent,Is Idpersistent,Indicates whether the identifier is a persistent identifier,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Identifier,False,False,Identifier.isIDPersistent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/isIDPersistent,ods:isIDPersistent,boolean
+ods:,TombstoneMetadata,Tombstone Metadata,The tombstone metadata about the tombstoned digital object,,,,http://www.w3.org/2000/01/rdf-schema#Class,TombstoneMetadata,False,True,TombstoneMetadata,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstoneMetadata,ods:TombstoneMetadata,
+ods:,tombstonedDate,Tombstoned Date,Timestamp the Digital Object was tombstoned and no longer active.,,,['2021-06-01T12:00:000Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.tombstonedDate,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/tombstonedDate,ods:tombstonedDate,string
+ods:,tombstonedText,Tombstoned Text,A reason why the Digital Object was tombstoned,,,"['This is a duplicate of XXX', 'This object was made by mistake']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.tombstonedText,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/tombstonedText,ods:tombstonedText,string
+ods:,TombstonedByAgent,Tombstoned By Agent,"The agent who tombstoned the object, contains an ods:Agent object",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.TombstonedByAgent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstonedByAgent,ods:TombstonedByAgent,object
+ods:,hasRelatedPID,Has Related Pid,The PIDs of the object the tombstoned object is related to,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,False,False,TombstoneMetadata.hasRelatedPID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasRelatedPID,ods:hasRelatedPID,array
diff --git a/app/data/opends/digital-specimen-termlist.csv b/app/data/opends/digital-specimen-termlist.csv
index c3c984a..f9e38c6 100644
--- a/app/data/opends/digital-specimen-termlist.csv
+++ b/app/data/opends/digital-specimen-termlist.csv
@@ -2,6 +2,7 @@ namespace,term_local_name,label,definition,usage,notes,examples,rdf_type,class_n
 ods:,DigitalSpecimen,Digital Specimen,A digital representation of a physical specimen,,,,http://www.w3.org/2000/01/rdf-schema#Class,DigitalSpecimen,True,True,DigitalSpecimen,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/DigitalSpecimen,ods:DigitalSpecimen,
 ods:,ID,Id,The unique identifier of the object,,,['https://doi.org/10.22/XXX-XXX-XXX'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,True,False,DigitalSpecimen.ID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/ID,ods:ID,string
 ods:,version,Version,"The version of the object, each change generates a new version",,,[1],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,True,False,DigitalSpecimen.version,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/version,ods:version,integer
+ods:,status,Status,The status of the Digital Object,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.status,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/status,ods:status,
 ods:,created,Created,The timestamp that the object version was created in DiSSCo,,,['2023-10-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,True,False,DigitalSpecimen.created,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/created,ods:created,string
 ods:,type,Type,The DOI to the FDO type of the object,,,['https://doi.org/10.15468/1a2b3c'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,True,False,DigitalSpecimen.type,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/type,ods:type,string
 ods:,midsLevel,Mids Level,"The MIDS level of the object, see https://www.tdwg.org/community/cd/mids/",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,True,False,DigitalSpecimen.midsLevel,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/midsLevel,ods:midsLevel,integer
@@ -22,14 +23,14 @@ dcterms:,modified,Modified,https://purl.org/dc/terms/modified,,,['2023-10-02T12:
 dwc:,basisOfRecord,Basis Of Record,https://rs.tdwg.org/dwc/terms/basisOfRecord,,,['PreservedSpecimen'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.basisOfRecord,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/basisOfRecord,dwc:basisOfRecord,string
 dwc:,preparations,Preparations,https://rs.tdwg.org/dwc/terms/preparations,,,['fossil'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.preparations,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/preparations,dwc:preparations,string
 dwc:,disposition,Disposition,https://rs.tdwg.org/dwc/terms/disposition,,,['in collection'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.disposition,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/disposition,dwc:disposition,string
-dwc:,institutionCode,Institution Code,https://rs.tdwg.org/dwc/terms/institutionCode,,,['MNF'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.institutionCode,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/institutionCode,dwc:institutionCode,string
-dwc:,institutionID,Institution Id,"ROR or Wikidata identifier, based on https://rs.tdwg.org/dwc/terms/institutionID",,,['https://ror.org/015hz7p22'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,True,False,DigitalSpecimen.institutionID,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/institutionID,dwc:institutionID,string
-ods:,institutionName,Institution Name,Full museum name according to ROR or Wikidata,,,['National Museum of Natural History'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.institutionName,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/institutionName,ods:institutionName,string
+ods:,organisationCode,Organisation Code,Code used by the organisation,,,['MNF'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.organisationCode,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/organisationCode,ods:organisationCode,string
+ods:,organisationID,Organisation Id,ROR or Wikidata identifier of the organisation,,,['https://ror.org/015hz7p22'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,True,False,DigitalSpecimen.organisationID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/organisationID,ods:organisationID,string
+ods:,organisationName,Organisation Name,Full museum name according to ROR or Wikidata,,,['National Museum of Natural History'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.organisationName,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/organisationName,ods:organisationName,string
 dwc:,collectionCode,Collection Code,https://rs.tdwg.org/dwc/terms/collectionCode,,,['EBIRD'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.collectionCode,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/collectionCode,dwc:collectionCode,string
 dwc:,collectionID,Collection Id,https://rs.tdwg.org/dwc/terms/collectionID,,,['https://www.gbif.org/grscicoll/collection/fbd3ed74-5a21-4e01-b86a-33d36f032d9c'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.collectionID,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/collectionID,dwc:collectionID,string
 dwc:,informationWithheld,Information Withheld,https://rs.tdwg.org/dwc/terms/informationWithheld,,,['location information not given for endangered species'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.informationWithheld,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/informationWithheld,dwc:informationWithheld,string
 dwc:,dataGeneralizations,Data Generalizations,https://rs.tdwg.org/dwc/terms/dataGeneralizations,,,['Coordinates generalized from original GPS coordinates to the nearest half degree grid cell.'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.dataGeneralizations,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/dataGeneralizations,dwc:dataGeneralizations,string
-dwc:,ownerInstitutionCode,Owner Institution Code,https://rs.tdwg.org/dwc/terms/ownerInstitutionCode,,,['InBio'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.ownerInstitutionCode,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/ownerInstitutionCode,dwc:ownerInstitutionCode,string
+ods:,ownerOrganisationCode,Owner Organisation Code,The name used by the organisation having ownership of the object,,,['InBio'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.ownerOrganisationCode,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/ownerOrganisationCode,ods:ownerOrganisationCode,string
 dwc:,recordedBy,Recorded By,https://rs.tdwg.org/dwc/terms/recordedBy,,,['José E. Crespo'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.recordedBy,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/recordedBy,dwc:recordedBy,string
 dwc:,recordedByID,Recorded By Id,https://rs.tdwg.org/dwc/terms/recordedByID,,,['https://orcid.org/0000-0002-1825-0097'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.recordedByID,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/recordedByID,dwc:recordedByID,string
 dwc:,datasetName,Dataset Name,https://rs.tdwg.org/dwc/terms/datasetName,,,['Hummingbirds'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.datasetName,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/datasetName,dwc:datasetName,string
@@ -42,7 +43,7 @@ dwc:,organismName,Organism Name,https://rs.tdwg.org/dwc/terms/organismName,,,['B
 dwc:,organismScope,Organism Scope,https://rs.tdwg.org/dwc/terms/organismScope,,,['colony'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.organismScope,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/organismScope,dwc:organismScope,string
 dwc:,associatedOrganisms,Associated Organisms,https://rs.tdwg.org/dwc/terms/associatedOrganisms,,,['sibling of http://arctos.database.museum/guid/DMNS:Mamm:14171'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.associatedOrganisms,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/associatedOrganisms,dwc:associatedOrganisms,string
 dwc:,organismRemarks,Organism Remarks,https://rs.tdwg.org/dwc/terms/organismRemarks,,,['One of a litter of six'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.organismRemarks,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/organismRemarks,dwc:organismRemarks,string
-dwc:,dynamicProperties,Dynamic Properties,https://rs.tdwg.org/dwc/terms/dynamicProperties,,,"[{'relativeHumidity': 28, 'airTemperatureInCelsius': 22}]",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.dynamicProperties,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/dynamicProperties,dwc:dynamicProperties,object
+dwc:,dynamicProperties,Dynamic Properties,https://rs.tdwg.org/dwc/terms/dynamicProperties,,,"['{""relativeHumidity"": 28,""airTemperatureInCelsius"": 22}']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.dynamicProperties,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/dynamicProperties,dwc:dynamicProperties,string
 ods:,hasMaterialEntity,Has Material Entity,Contains zero or more ods:MaterialEntity objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.hasMaterialEntity,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasMaterialEntity,ods:hasMaterialEntity,array
 ods:,hasIdentification,Has Identification,Contains zero or more ods:Identification objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.hasIdentification,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasIdentification,ods:hasIdentification,array
 ods:,hasAssertion,Has Assertion,Contains zero or more ods:Assertion objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.hasAssertion,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasAssertion,ods:hasAssertion,array
@@ -52,17 +53,18 @@ ods:,hasCitation,Has Citation,Contains zero or more ods:Citation objects,,,,http
 ods:,hasIdentifier,Has Identifier,Contains zero or more ods:Identifier objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.hasIdentifier,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasIdentifier,ods:hasIdentifier,array
 ods:,hasChronometricAge,Has Chronometric Age,Contains zero or more ods:ChronometricAge objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.hasChronometricAge,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasChronometricAge,ods:hasChronometricAge,array
 ods:,hasAgent,Has Agent,Contains zero or more ods:Agent objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.hasAgent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasAgent,ods:hasAgent,array
+ods:,TombstoneMetadata,Tombstone Metadata,Object containing the tombstone metadata of the object. Only present when ods:status is ods:Tombstone,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,DigitalSpecimen,False,False,DigitalSpecimen.TombstoneMetadata,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstoneMetadata,ods:TombstoneMetadata,object
 ods:,MaterialEntity,Material Entity,Material Entities that are part of the Digital Specimen,,,,http://www.w3.org/2000/01/rdf-schema#Class,MaterialEntity,False,True,MaterialEntity,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/MaterialEntity,ods:MaterialEntity,
 dwc:,materialEntityID,Material Entity Id,https://rs.tdwg.org/dwc/terms/materialEntityID,,,['06809dc5-f143-459a-be1a-6f03e63fc083'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.materialEntityID,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/materialEntityID,dwc:materialEntityID,string
 ods:,materialEntityType,Material Entity Type,Type of material entity,,,['organism'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.materialEntityType,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/materialEntityType,ods:materialEntityType,string
 dwc:,preparations,Preparations,https://rs.tdwg.org/dwc/terms/preparations,,,['fossil'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.preparations,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/preparations,dwc:preparations,string
 dwc:,disposition,Disposition,https://rs.tdwg.org/dwc/terms/disposition,,,['in collection'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.disposition,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/disposition,dwc:disposition,string
-dwc:,institutionCode,Institution Code,https://rs.tdwg.org/dwc/terms/institutionCode,,,['MNF'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.institutionCode,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/institutionCode,dwc:institutionCode,string
-dwc:,institutionID,Institution Id,"ROR or Wikidata identifier, based on https://rs.tdwg.org/dwc/terms/institutionID",,,['https://ror.org/015hz7p22'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.institutionID,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/institutionID,dwc:institutionID,string
-ods:,institutionName,Institution Name,Full museum name according to ROR or Wikidata,,,['National Museum of Natural History'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.institutionName,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/institutionName,ods:institutionName,string
+ods:,organisationCode,Organisation Code,Code used by the organisation,,,['MNF'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.organisationCode,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/organisationCode,ods:organisationCode,string
+ods:,organisationID,Organisation Id,ROR or Wikidata identifier of the organisation,,,['https://ror.org/015hz7p22'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.organisationID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/organisationID,ods:organisationID,string
+ods:,organisationName,Organisation Name,Full museum name according to ROR or Wikidata,,,['National Museum of Natural History'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.organisationName,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/organisationName,ods:organisationName,string
 dwc:,collectionCode,Collection Code,https://rs.tdwg.org/dwc/terms/collectionCode,,,['EBIRD'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.collectionCode,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/collectionCode,dwc:collectionCode,string
 dwc:,collectionID,Collection Id,https://rs.tdwg.org/dwc/terms/collectionID,,,['https://www.gbif.org/grscicoll/collection/fbd3ed74-5a21-4e01-b86a-33d36f032d9c'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.collectionID,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/collectionID,dwc:collectionID,string
-dwc:,ownerInstitutionCode,Owner Institution Code,https://rs.tdwg.org/dwc/terms/ownerInstitutionCode,,,['InBio'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.ownerInstitutionCode,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/ownerInstitutionCode,dwc:ownerInstitutionCode,string
+ods:,ownerOrganisationCode,Owner Organisation Code,The name used by the organisation having ownership of the object,,,['InBio'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.ownerOrganisationCode,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/ownerOrganisationCode,ods:ownerOrganisationCode,string
 dwc:,recordedBy,Recorded By,https://rs.tdwg.org/dwc/terms/recordedBy,,,['José E. Crespo'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.recordedBy,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/recordedBy,dwc:recordedBy,string
 dwc:,recordedByID,Recorded By Id,https://rs.tdwg.org/dwc/terms/recordedByID,,,['https://orcid.org/0000-0002-1825-0097'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.recordedByID,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/recordedByID,dwc:recordedByID,string
 dwc:,verbatimLabel,Verbatim Label,https://rs.tdwg.org/dwc/terms/verbatimLabel,,,"['ILL: Union Co. Wolf Lake by Powder Plant Bridge. 1 March 1975 Coll. S. Ketzler, S. Herbert\n\nMonotoma longicollis 4 â\x99\x82 Det TC McElrath 2018\n\nINHS Insect Collection 456782']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MaterialEntity,False,False,MaterialEntity.verbatimLabel,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/verbatimLabel,dwc:verbatimLabel,string
@@ -227,13 +229,13 @@ dwc:,formation,Formation,https://rs.tdwg.org/dwc/terms/formation,,,['House Limes
 dwc:,member,Member,https://rs.tdwg.org/dwc/terms/member,,,['Lava Dam Member'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,GeologicalContext,False,False,ods:GeologicalContext.member,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/member,dwc:member,string
 dwc:,bed,Bed,https://rs.tdwg.org/dwc/terms/bed,,,['Harlem coal'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,GeologicalContext,False,False,ods:GeologicalContext.bed,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/bed,dwc:bed,string
 ods:,Agent,Agent,The Agent of the digital specimen,,,,http://www.w3.org/2000/01/rdf-schema#Class,Agent,False,True,Agent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/Agent,ods:Agent,
-ods:,agentRole,Agent Role,Indicates the role of the agent,,,"['collector', 'preparer', 'identifier', 'recorder']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,True,False,Agent.agentRole,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/agentRole,ods:agentRole,string
-ods:,agentType,Agent Type,Indicates the type of agent,,,"['machine', 'human', 'organisation']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,True,False,Agent.agentType,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/agentType,ods:agentType,string
-ods:,agentID,Agent Id,"Primary identifier of the agent, additional identifiers can go in the identifiers array",,,['https://orcid.org/0000-0002-1825-0097'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.agentID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/agentID,ods:agentID,string
-ods:,agentName,Agent Name,Full name of the agent,,,['John Smith'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,True,False,Agent.agentName,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/agentName,ods:agentName,string
-ods:,agentRoleBegan,Agent Role Began,Date the agent began the role,,,['2023-10-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.agentRoleBegan,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/agentRoleBegan,ods:agentRoleBegan,string
-ods:,agentRoleEnded,Agent Role Ended,Date the agent ended the role,,,['2023-09-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.agentRoleEnded,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/agentRoleEnded,ods:agentRoleEnded,string
-ods:,agentRoleOrder,Agent Role Order,Order of the agent in the role. Can be used to indicate the order of importance,,,"[1, 2]",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.agentRoleOrder,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/agentRoleOrder,ods:agentRoleOrder,integer
+schema:,name,Name,Full name of the agent,,,['John Smith'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,True,False,Agent.name,http://schema.org/,http://schema.org/name,schema:name,string
+schema:,roleName,Role Name,"Indicates the role of the agent, https://schema.org/roleName",,,"['collector', 'preparer', 'identifier', 'recorder']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.roleName,http://schema.org/,http://schema.org/roleName,schema:roleName,string
+schema:,startDate,Start Date,Date the agent began the role,,,['2023-10-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.startDate,http://schema.org/,http://schema.org/startDate,schema:startDate,string
+schema:,endDate,End Date,Date the agent ended the role,,,['2023-09-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.endDate,http://schema.org/,http://schema.org/endDate,schema:endDate,string
+ods:,roleOrder,Role Order,Order of the agent in the role. Can be used to indicate the order of importance,,,"[1, 2]",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.roleOrder,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/roleOrder,ods:roleOrder,integer
+schema:,email,Email,"Email of the agent, can be present in case the agent is a maintainer of a MAS",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.email,http://schema.org/,http://schema.org/email,schema:email,string
+schema:,url,Url,"URL of the agent, can be present in case the agent is a maintainer of a MAS",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.url,http://schema.org/,http://schema.org/url,schema:url,string
 ods:,hasIdentifier,Has Identifier,Contains zero or more ods:Identifier objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.hasIdentifier,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasIdentifier,ods:hasIdentifier,array
 ods:,Assertion,Assertion,The Assertion of the digital specimen,,,,http://www.w3.org/2000/01/rdf-schema#Class,Assertion,False,True,Assertion,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/Assertion,ods:Assertion,
 dwc:,measurementID,Measurement Id,https://rs.tdwg.org/dwc/terms/measurementID,,,['9c752d22-b09a-11e8-96f8-529269fb1459'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.measurementID,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/measurementID,dwc:measurementID,string
@@ -246,8 +248,7 @@ dwciri:,measurementValue,Measurement Value,https://rs.tdwg.org/dwc/terms/measure
 dwc:,measurementAccuracy,Measurement Accuracy,https://rs.tdwg.org/dwc/terms/measurementAccuracy,,,"['0.1', 'normal distribution with variation of 2 m']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.measurementAccuracy,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/measurementAccuracy,dwc:measurementAccuracy,string
 dwc:,measurementUnit,Measurement Unit,https://rs.tdwg.org/dwc/terms/measurementUnit,,,"['m', 'cm']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.measurementUnit,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/measurementUnit,dwc:measurementUnit,string
 dwciri:,measurementUnit,Measurement Unit,https://rs.tdwg.org/dwc/iri/measurementUnit,,,['http://vocab.nerc.ac.uk/collection/P06/current/UMSQ/'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.measurementUnit,http://rs.tdwg.org/dwc/iri/,http://rs.tdwg.org/dwc/iri/measurementUnit,dwciri:measurementUnit,string
-ods:,assertionByAgentName,Assertion By Agent Name,Name of the agent who made the assertion,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.assertionByAgentName,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/assertionByAgentName,ods:assertionByAgentName,string
-ods:,assertionByAgentID,Assertion By Agent Id,"ID of the agent who made the assertion, recommended to be a ORCID or Wikidata identifier",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.assertionByAgentID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/assertionByAgentID,ods:assertionByAgentID,string
+ods:,AssertionByAgent,Assertion By Agent,"The agent who made the assertion, contains an ods:Agent object",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.AssertionByAgent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/AssertionByAgent,ods:AssertionByAgent,object
 ods:,assertionProtocol,Assertion Protocol,The protocol used to make the assertion,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.assertionProtocol,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/assertionProtocol,ods:assertionProtocol,string
 ods:,assertionProtocolID,Assertion Protocol Id,The ID of the protocol used to make the assertion,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.assertionProtocolID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/assertionProtocolID,ods:assertionProtocolID,string
 ods:,assertionRemarks,Assertion Remarks,Remarks about the assertion,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Assertion,False,False,Assertion.assertionRemarks,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/assertionRemarks,ods:assertionRemarks,string
@@ -256,7 +257,7 @@ dcterms:,identifier,Identifier,https://purl.org/dc/terms/identifier,,,,http://ww
 dcterms:,type,Type,https://purl.org/dc/terms/type,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,False,False,Citation.type,http://purl.org/dc/terms/,http://purl.org/dc/terms/type,dcterms:type,string
 dcterms:,date,Date,https://purl.org/dc/terms/date,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,False,False,Citation.date,http://purl.org/dc/terms/,http://purl.org/dc/terms/date,dcterms:date,string
 dcterms:,title,Title,https://purl.org/dc/terms/title,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,True,False,Citation.title,http://purl.org/dc/terms/,http://purl.org/dc/terms/title,dcterms:title,string
-dcterms:,creator,Creator,https://purl.org/dc/elements/1.1/creator,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,False,False,Citation.creator,http://purl.org/dc/terms/,http://purl.org/dc/terms/creator,dcterms:creator,string
+dcterms:,creator,Creator,Contains an ods:Agent object,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,False,False,Citation.creator,http://purl.org/dc/terms/,http://purl.org/dc/terms/creator,dcterms:creator,object
 ods:,citationPageNumber,Citation Page Number,Page number of the citation,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,False,False,Citation.citationPageNumber,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/citationPageNumber,ods:citationPageNumber,string
 ods:,citationRemarks,Citation Remarks,Any further remarks about the citation,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,False,False,Citation.citationRemarks,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/citationRemarks,ods:citationRemarks,string
 ods:,referenceType,Reference Type,The type of reference,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Citation,False,False,Citation.referenceType,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/referenceType,ods:referenceType,string
@@ -271,8 +272,8 @@ dwc:,relatedResourceID,Related Resource Id,https://rs.tdwg.org/dwc/terms/related
 ods:,relatedResourceURI,Related Resource Uri,The URI of the related resource,,,['https://www.gbif.org/occurrence/3024470157'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,EntityRelationship,False,False,EntityRelationship.relatedResourceURI,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/relatedResourceURI,ods:relatedResourceURI,string
 dwc:,relationshipEstablishedDate,Relationship Established Date,https://rs.tdwg.org/dwc/terms/relationshipEstablishedDate,,,['2024-05-30T09:46:20.120Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,EntityRelationship,False,False,EntityRelationship.relationshipEstablishedDate,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/relationshipEstablishedDate,dwc:relationshipEstablishedDate,string
 ods:,entityRelationshipOrder,Entity Relationship Order,When multiple relationships are added an order can be defined,,,[1],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,EntityRelationship,False,False,EntityRelationship.entityRelationshipOrder,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/entityRelationshipOrder,ods:entityRelationshipOrder,integer
+ods:,RelationshipAccordingToAgent,Relationship According To Agent,The agent who created the entity relationship. Contains an ods:Agent object,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,EntityRelationship,False,False,EntityRelationship.RelationshipAccordingToAgent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/RelationshipAccordingToAgent,ods:RelationshipAccordingToAgent,object
 dwc:,relationshipAccordingTo,Relationship According To,https://rs.tdwg.org/dwc/terms/relationshipAccordingTo,,,['Sam Leeflang'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,EntityRelationship,False,False,EntityRelationship.relationshipAccordingTo,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/relationshipAccordingTo,dwc:relationshipAccordingTo,string
-ods:,relationshipAccordingToID,Relationship According To Id,"The PID of the creator, this could be a Orcid(user), PID(machine) or ROR(organisation)",,,['https://orcid.org/0000-0002-5669-2769'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,EntityRelationship,False,False,EntityRelationship.relationshipAccordingToID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/relationshipAccordingToID,ods:relationshipAccordingToID,string
 dwc:,relationshipRemarks,Relationship Remarks,https://rs.tdwg.org/dwc/terms/relationshipRemarks,,,['Mother and offspring collected from the same nest'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,EntityRelationship,False,False,EntityRelationship.relationshipRemarks,http://rs.tdwg.org/dwc/terms/,http://rs.tdwg.org/dwc/terms/relationshipRemarks,dwc:relationshipRemarks,string
 ods:,Identifier,Identifier,The Identifier of the digital specimen,,,,http://www.w3.org/2000/01/rdf-schema#Class,Identifier,False,True,Identifier,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/Identifier,ods:Identifier,
 dcterms:,title,Title,"The type of the identifier, https://purl.org/dc/elements/1.1/title",,,"['dwc:catalogueNumber', 'dwca:id']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Identifier,False,False,Identifier.title,http://purl.org/dc/terms/,http://purl.org/dc/terms/title,dcterms:title,string
@@ -302,3 +303,8 @@ chrono:,chronometricAgeDeterminedBy,Chronometric Age Determined By,https://rs.td
 chrono:,chronometricAgeDeterminedDate,Chronometric Age Determined Date,https://rs.tdwg.org/chrono/terms/chronometricAgeDeterminedDate,,,['2018-11-13T20:20:39+00:00'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,ChronometricAge,False,False,ChronometricAge.chronometricAgeDeterminedDate,http://rs.tdwg.org/chrono/terms/,http://rs.tdwg.org/chrono/terms/chronometricAgeDeterminedDate,chrono:chronometricAgeDeterminedDate,string
 chrono:,chronometricAgeReferences,Chronometric Age References,https://rs.tdwg.org/chrono/terms/chronometricAgeReferences,,,['https://doi.org/10.1007/s10814-019-09140-x'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,ChronometricAge,False,False,ChronometricAge.chronometricAgeReferences,http://rs.tdwg.org/chrono/terms/,http://rs.tdwg.org/chrono/terms/chronometricAgeReferences,chrono:chronometricAgeReferences,string
 chrono:,chronometricAgeRemarks,Chronometric Age Remarks,https://rs.tdwg.org/chrono/terms/chronometricAgeRemarks,,,['Beta Analytic number: 323913'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,ChronometricAge,False,False,ChronometricAge.chronometricAgeRemarks,http://rs.tdwg.org/chrono/terms/,http://rs.tdwg.org/chrono/terms/chronometricAgeRemarks,chrono:chronometricAgeRemarks,string
+ods:,TombstoneMetadata,Tombstone Metadata,The tombstone metadata about the tombstoned digital object,,,,http://www.w3.org/2000/01/rdf-schema#Class,TombstoneMetadata,False,True,TombstoneMetadata,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstoneMetadata,ods:TombstoneMetadata,
+ods:,tombstonedDate,Tombstoned Date,Timestamp the Digital Object was tombstoned and no longer active.,,,['2021-06-01T12:00:000Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.tombstonedDate,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/tombstonedDate,ods:tombstonedDate,string
+ods:,tombstonedText,Tombstoned Text,A reason why the Digital Object was tombstoned,,,"['This is a duplicate of XXX', 'This object was made by mistake']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.tombstonedText,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/tombstonedText,ods:tombstonedText,string
+ods:,TombstonedByAgent,Tombstoned By Agent,"The agent who tombstoned the object, contains an ods:Agent object",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.TombstonedByAgent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstonedByAgent,ods:TombstonedByAgent,object
+ods:,hasRelatedPID,Has Related Pid,The PIDs of the object the tombstoned object is related to,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,False,False,TombstoneMetadata.hasRelatedPID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasRelatedPID,ods:hasRelatedPID,array
diff --git a/app/data/opends/machine-annotation-service-termlist.csv b/app/data/opends/machine-annotation-service-termlist.csv
index 5c840d0..b527be9 100644
--- a/app/data/opends/machine-annotation-service-termlist.csv
+++ b/app/data/opends/machine-annotation-service-termlist.csv
@@ -2,12 +2,12 @@ namespace,term_local_name,label,definition,usage,notes,examples,rdf_type,class_n
 ods:,MachineAnnotationService,Machine Annotation Service,A Machine Annotation Service,,,,http://www.w3.org/2000/01/rdf-schema#Class,MachineAnnotationService,True,True,MachineAnnotationService,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/MachineAnnotationService,ods:MachineAnnotationService,
 ods:,ID,Id,Handle of the Machine Annotation Service,,,['https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,True,False,MachineAnnotationService.ID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/ID,ods:ID,string
 ods:,type,Type,The DOI to the FDO type of the object,,,['https://doi.org/10.15468/1a2b3c'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,True,False,MachineAnnotationService.type,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/type,ods:type,string
+ods:,status,Status,The status of the Digital Object,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.status,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/status,ods:status,
 schema:,version,Version,"Version of the Machine Annotation Service, https://schema.org/version",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.version,http://schema.org/,http://schema.org/version,schema:version,integer
 schema:,name,Name,"Name of the Machine Annotation Service as provided by the user, https://schema.org/name",,,['GBIF Linker Service'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,True,False,MachineAnnotationService.name,http://schema.org/,http://schema.org/name,schema:name,string
 schema:,description,Description,"Description of the Machine Annotation Service as provided by the user, https://schema.org/description",,,['A service that links GBIF records to a DiSSCo Digital Specimen. It creates an EntityRelationship indicating the relationship'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.description,http://schema.org/,http://schema.org/description,schema:description,string
 schema:,dateCreated,Date Created,"Timestamp of creation. Internally generated, https://schema.org/dateCreated",,,['2021-06-01T12:00:000Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.dateCreated,http://schema.org/,http://schema.org/dateCreated,schema:dateCreated,string
-ods:,dateTombstoned,Date Tombstoned,Timestamp Machine Annotation Service was tombstoned and no longer active. Generated on request of the user,,,['2021-06-01T12:00:000Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.dateTombstoned,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/dateTombstoned,ods:dateTombstoned,string
-ods:,creator,Creator,The internal user ID of the creator of the Machine Annotation Service,,,['e2befba6-9324-4bb4-9f41-d7dfae4a44b0'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.creator,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/creator,ods:creator,string
+schema:,creator,Creator,Contains an ods:Agent object,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.creator,http://schema.org/,http://schema.org/creator,schema:creator,object
 ods:,containerImage,Container Image,URI of the image of the containerized application,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,True,False,MachineAnnotationService.containerImage,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/containerImage,ods:containerImage,string
 ods:,containerTag,Container Tag,Tag of the image,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,True,False,MachineAnnotationService.containerTag,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/containerTag,ods:containerTag,string
 ods:,TargetDigitalObjectFilter,Target Digital Object Filter,"Filters describing the criteria that must be met in order to apply the MAS. No filters implies the MAS may run on *any* digital object. Field names are given in JSON paths, and accepted values for that field are provided as an arrays",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.TargetDigitalObjectFilter,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TargetDigitalObjectFilter,ods:TargetDigitalObjectFilter,object
@@ -15,11 +15,7 @@ schema:,creativeWorkStatus,Creative Work Status,"The current status of the servi
 schema:,codeRepository,Code Repository,"Link to code base of MAS, https://schema.org/codeRepository",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.codeRepository,http://schema.org/,http://schema.org/codeRepository,schema:codeRepository,string
 schema:,programmingLanguage,Programming Language,"The programming language of the MAS, https://schema.org/programmingLanguage",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.programmingLanguage,http://schema.org/,http://schema.org/programmingLanguage,schema:programmingLanguage,string
 ods:,serviceAvailability,Service Availability,Availability commitment of the service provider as described in the SLA,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.serviceAvailability,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/serviceAvailability,ods:serviceAvailability,string
-schema:,maintainer,Maintainer,Party maintaining the code,,,,http://www.w3.org/2000/01/rdf-schema#Class,MachineAnnotationService,False,False,MachineAnnotationService.maintainer,http://schema.org/,http://schema.org/maintainer,schema:maintainer,object
-schema:,identifier,Identifier,"Identifier of the maintainer, https://schema.org/identifier. Recommendation to use ROR or ORCID",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,maintainer,False,False,schema:maintainer.identifier,http://schema.org/,http://schema.org/identifier,schema:identifier,string
-schema:,name,Name,"Name of the maintainer, https://schema.org/name",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,maintainer,False,False,schema:maintainer.name,http://schema.org/,http://schema.org/name,schema:name,string
-schema:,email,Email,"Email of the maintainer, https://schema.org/email",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,maintainer,False,False,schema:maintainer.email,http://schema.org/,http://schema.org/email,schema:email,string
-schema:,url,Url,"URL of the maintainer, https://schema.org/url",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,maintainer,False,False,schema:maintainer.url,http://schema.org/,http://schema.org/url,schema:url,string
+schema:,maintainer,Maintainer,"Party maintaining the code, could be an schema:Organisation or a schema:Person",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.maintainer,http://schema.org/,http://schema.org/maintainer,schema:maintainer,object
 schema:,license,License,"License of the service, https://schema.org/license",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.license,http://schema.org/,http://schema.org/license,schema:license,string
 ods:,dependency,Dependency,Handles from other MAS that this MAS depends on,,,[['https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX']],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.dependency,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/dependency,ods:dependency,array
 schema:,ContactPoint,Contact Point,"The contact point for support and information for the MAS, https://schema.org/ContactPoint",,,,http://www.w3.org/2000/01/rdf-schema#Class,MachineAnnotationService,False,False,MachineAnnotationService.ContactPoint,http://schema.org/,http://schema.org/ContactPoint,schema:ContactPoint,object
@@ -31,3 +27,18 @@ ods:,slaDocumentation,Sla Documentation,Link to SLA documentation,,,,http://www.
 ods:,topicName,Topic Name,Kafka topic through which the MAS receives messages. Defaults to PID of MAS,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.topicName,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/topicName,ods:topicName,string
 ods:,batchingPermitted,Batching Permitted,"Whether or not this MAS can create Batch Annotations. MAS outputs must then comply with batchMetadata, see https://schemas.dissco.tech/schemas/annotations/0.1.0/annotation-event.json",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,True,False,MachineAnnotationService.batchingPermitted,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/batchingPermitted,ods:batchingPermitted,boolean
 ods:,timeToLive,Time To Live,Time in milliseconds the MAS message may remain in the Kafka Queue before being marked as timed out. Min 1 hour.,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,True,False,MachineAnnotationService.timeToLive,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/timeToLive,ods:timeToLive,integer
+ods:,TombstoneMetadata,Tombstone Metadata,Object containing the tombstone metadata of the object,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,MachineAnnotationService,False,False,MachineAnnotationService.TombstoneMetadata,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstoneMetadata,ods:TombstoneMetadata,object
+ods:,TombstoneMetadata,Tombstone Metadata,The tombstone metadata about the tombstoned digital object,,,,http://www.w3.org/2000/01/rdf-schema#Class,TombstoneMetadata,False,True,TombstoneMetadata,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstoneMetadata,ods:TombstoneMetadata,
+ods:,tombstonedDate,Tombstoned Date,Timestamp the Digital Object was tombstoned and no longer active.,,,['2021-06-01T12:00:000Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.tombstonedDate,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/tombstonedDate,ods:tombstonedDate,string
+ods:,tombstonedText,Tombstoned Text,A reason why the Digital Object was tombstoned,,,"['This is a duplicate of XXX', 'This object was made by mistake']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.tombstonedText,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/tombstonedText,ods:tombstonedText,string
+ods:,TombstonedByAgent,Tombstoned By Agent,"The agent who tombstoned the object, contains an ods:Agent object",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.TombstonedByAgent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstonedByAgent,ods:TombstonedByAgent,object
+ods:,hasRelatedPID,Has Related Pid,The PIDs of the object the tombstoned object is related to,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,False,False,TombstoneMetadata.hasRelatedPID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasRelatedPID,ods:hasRelatedPID,array
+ods:,Agent,Agent,Description of the agents connected to the digital object,,,,http://www.w3.org/2000/01/rdf-schema#Class,Agent,False,True,Agent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/Agent,ods:Agent,
+schema:,name,Name,Full name of the agent,,,['John Smith'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.name,http://schema.org/,http://schema.org/name,schema:name,string
+schema:,roleName,Role Name,"Indicates the role of the agent, https://schema.org/roleName",,,"['collector', 'preparer', 'identifier', 'recorder']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.roleName,http://schema.org/,http://schema.org/roleName,schema:roleName,string
+schema:,startDate,Start Date,Date the agent began the role,,,['2023-10-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.startDate,http://schema.org/,http://schema.org/startDate,schema:startDate,string
+schema:,endDate,End Date,Date the agent ended the role,,,['2023-09-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.endDate,http://schema.org/,http://schema.org/endDate,schema:endDate,string
+ods:,roleOrder,Role Order,Order of the agent in the role. Can be used to indicate the order of importance,,,"[1, 2]",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.roleOrder,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/roleOrder,ods:roleOrder,integer
+schema:,email,Email,"Email of the agent, can be present in case the agent is a maintainer of a MAS",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.email,http://schema.org/,http://schema.org/email,schema:email,string
+schema:,url,Url,"URL of the agent, can be present in case the agent is a maintainer of a MAS",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.url,http://schema.org/,http://schema.org/url,schema:url,string
+ods:,hasIdentifier,Has Identifier,Contains zero or more ods:Identifier objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.hasIdentifier,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasIdentifier,ods:hasIdentifier,array
diff --git a/app/data/opends/source-system-termlist.csv b/app/data/opends/source-system-termlist.csv
index 1255396..64547a6 100644
--- a/app/data/opends/source-system-termlist.csv
+++ b/app/data/opends/source-system-termlist.csv
@@ -2,13 +2,28 @@ namespace,term_local_name,label,definition,usage,notes,examples,rdf_type,class_n
 ods:,SourceSystem,Source System,"Source System Model, used to describe data providing systems",,,,http://www.w3.org/2000/01/rdf-schema#Class,SourceSystem,True,True,SourceSystem,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/SourceSystem,ods:SourceSystem,
 ods:,ID,Id,Handle of the Source System,,,['https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,True,False,SourceSystem.ID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/ID,ods:ID,string
 ods:,type,Type,The DOI to the FDO type of the object,,,['https://doi.org/10.15468/1a2b3c'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,True,False,SourceSystem.type,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/type,ods:type,string
+ods:,status,Status,The status of the Digital Object,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,False,False,SourceSystem.status,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/status,ods:status,
 schema:,version,Version,"Version of the Source System, https://schema.org/version",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,True,False,SourceSystem.version,http://schema.org/,http://schema.org/version,schema:version,integer
-schema:,name,Name,"Name of the Source System as provided by the user, https://schema.org/name",,,['Herbarium of University of Coimbra (COI)'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,False,False,SourceSystem.name,http://schema.org/,http://schema.org/name,schema:name,string
+schema:,name,Name,"Name of the Source System as provided by the user, https://schema.org/name",,,['Herbarium of University of Coimbra (COI)'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,True,False,SourceSystem.name,http://schema.org/,http://schema.org/name,schema:name,string
 schema:,description,Description,"Description of the Source System as provided by the user, https://schema.org/description",,,"['The herbarium collection of the University of Coimbra is one of the oldest in Portugal, with specimens dating back to the 18th century.']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,False,False,SourceSystem.description,http://schema.org/,http://schema.org/description,schema:description,string
 schema:,dateCreated,Date Created,"Timestamp of creation. Internally generated, https://schema.org/dateCreated",,,['2021-06-01T12:00:000Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,True,False,SourceSystem.dateCreated,http://schema.org/,http://schema.org/dateCreated,schema:dateCreated,string
-ods:,dateTombstoned,Date Tombstoned,Timestamp SourceSystem was tombstoned and no longer active. Generated on request of the user,,,['2021-06-01T12:00:000Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,False,False,SourceSystem.dateTombstoned,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/dateTombstoned,ods:dateTombstoned,string
-ods:,creator,Creator,The internal user ID of the creator of the Source System,,,['e2befba6-9324-4bb4-9f41-d7dfae4a44b0'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,True,False,SourceSystem.creator,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/creator,ods:creator,string
+schema:,creator,Creator,Contains an ods:Agent object,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,True,False,SourceSystem.creator,http://schema.org/,http://schema.org/creator,schema:creator,object
 schema:,url,Url,Endpoint from which data may be retrieved,,,['http://ipt.gbif.pt/ipt/archive.do?r=coi'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,False,False,SourceSystem.url,http://schema.org/,http://schema.org/url,schema:url,string
 ltc:,collectionManagementSystem,Collection Management System,"The collection management system that the source system is using, https://rs.tdwg.org/ltc/terms/collectionManagementSystem",,,['Specify 7'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,False,False,SourceSystem.collectionManagementSystem,http://rs.tdwg.org/ltc/terms/,http://rs.tdwg.org/ltc/terms/collectionManagementSystem,ltc:collectionManagementSystem,string
 ods:,translatorType,Translator Type,The serialisation of the data the endpoint provides indicating what type of Translator is required,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,True,False,SourceSystem.translatorType,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/translatorType,ods:translatorType,
 ods:,dataMappingID,Data Mapping Id,The Handle of the Mapping Object needed for this Source System,,,['https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,False,False,SourceSystem.dataMappingID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/dataMappingID,ods:dataMappingID,string
+ods:,TombstoneMetadata,Tombstone Metadata,Object containing the tombstone metadata of the object. Only present when ods:status is ods:Tombstone,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,SourceSystem,False,False,SourceSystem.TombstoneMetadata,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstoneMetadata,ods:TombstoneMetadata,object
+ods:,TombstoneMetadata,Tombstone Metadata,The tombstone metadata about the tombstoned digital object,,,,http://www.w3.org/2000/01/rdf-schema#Class,TombstoneMetadata,False,True,TombstoneMetadata,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstoneMetadata,ods:TombstoneMetadata,
+ods:,tombstonedDate,Tombstoned Date,Timestamp the Digital Object was tombstoned and no longer active.,,,['2021-06-01T12:00:000Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.tombstonedDate,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/tombstonedDate,ods:tombstonedDate,string
+ods:,tombstonedText,Tombstoned Text,A reason why the Digital Object was tombstoned,,,"['This is a duplicate of XXX', 'This object was made by mistake']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.tombstonedText,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/tombstonedText,ods:tombstonedText,string
+ods:,TombstonedByAgent,Tombstoned By Agent,"The agent who tombstoned the object, contains an ods:Agent object",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,True,False,TombstoneMetadata.TombstonedByAgent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/TombstonedByAgent,ods:TombstonedByAgent,object
+ods:,hasRelatedPID,Has Related Pid,The PIDs of the object the tombstoned object is related to,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,TombstoneMetadata,False,False,TombstoneMetadata.hasRelatedPID,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasRelatedPID,ods:hasRelatedPID,array
+ods:,Agent,Agent,Description of the agents connected to the digital object,,,,http://www.w3.org/2000/01/rdf-schema#Class,Agent,False,True,Agent,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/Agent,ods:Agent,
+schema:,name,Name,Full name of the agent,,,['John Smith'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.name,http://schema.org/,http://schema.org/name,schema:name,string
+schema:,roleName,Role Name,"Indicates the role of the agent, https://schema.org/roleName",,,"['collector', 'preparer', 'identifier', 'recorder']",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.roleName,http://schema.org/,http://schema.org/roleName,schema:roleName,string
+schema:,startDate,Start Date,Date the agent began the role,,,['2023-10-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.startDate,http://schema.org/,http://schema.org/startDate,schema:startDate,string
+schema:,endDate,End Date,Date the agent ended the role,,,['2023-09-02T12:31:34.806Z'],http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.endDate,http://schema.org/,http://schema.org/endDate,schema:endDate,string
+ods:,roleOrder,Role Order,Order of the agent in the role. Can be used to indicate the order of importance,,,"[1, 2]",http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.roleOrder,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/roleOrder,ods:roleOrder,integer
+schema:,email,Email,"Email of the agent, can be present in case the agent is a maintainer of a MAS",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.email,http://schema.org/,http://schema.org/email,schema:email,string
+schema:,url,Url,"URL of the agent, can be present in case the agent is a maintainer of a MAS",,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.url,http://schema.org/,http://schema.org/url,schema:url,string
+ods:,hasIdentifier,Has Identifier,Contains zero or more ods:Identifier objects,,,,http://www.w3.org/1999/02/22-rdf-syntax-ns#Property,Agent,False,False,Agent.hasIdentifier,http://rs.dissco.eu/opends/terms/,http://rs.dissco.eu/opends/terms/hasIdentifier,ods:hasIdentifier,array
diff --git a/app/templates/includes/resources/diagrams/class-diagrams/annotation-full.html b/app/templates/includes/resources/diagrams/class-diagrams/annotation-full.html
index 63f6f7f..ecc9d4a 100644
--- a/app/templates/includes/resources/diagrams/class-diagrams/annotation-full.html
+++ b/app/templates/includes/resources/diagrams/class-diagrams/annotation-full.html
@@ -1,15 +1,21 @@
 classDiagram
  class Annotation { 
    ID : string 
+   status : None 
    jobID : string 
    type : string 
    version : integer 
    motivation : None 
    motivatedBy : string 
+   creator : object 
    created : string 
-   dateTombstoned : string 
    issued : string 
+   generator : object 
    batchID : string 
+   mergingDecisionStatus : None 
+   mergingStateChangeDate : string 
+   MergingStateChangedBy : object 
+   TombstoneMetadata : object 
  }
  class hasTarget { 
    ID : string 
@@ -21,18 +27,28 @@
    references : string 
    score : number 
  }
- class creator { 
-   name : string 
- }
- class generator { 
-   name : string 
- }
  class AggregateRating { 
    ratingCount : integer 
    ratingValue : number 
  }
+ class TombstoneMetadata { 
+   tombstonedDate : string 
+   tombstonedText : string 
+   TombstonedByAgent : object 
+   hasRelatedPID : array 
+ }
+ class Agent { 
+   name : string 
+   roleName : string 
+   startDate : string 
+   endDate : string 
+   roleOrder : integer 
+   email : string 
+   url : string 
+   hasIdentifier : array 
+ }
 Annotation -- hasTarget 
 Annotation -- hasBody 
-Annotation -- creator 
-Annotation -- generator 
 Annotation -- AggregateRating 
+Annotation -- TombstoneMetadata 
+Annotation -- Agent 
diff --git a/app/templates/includes/resources/diagrams/class-diagrams/create-update-tombstone-event-full.html b/app/templates/includes/resources/diagrams/class-diagrams/create-update-tombstone-event-full.html
index d06081a..e8495cb 100644
--- a/app/templates/includes/resources/diagrams/class-diagrams/create-update-tombstone-event-full.html
+++ b/app/templates/includes/resources/diagrams/class-diagrams/create-update-tombstone-event-full.html
@@ -2,9 +2,10 @@
  class CreateUpdateTombstoneEvent { 
    ID : string 
    type : string 
+   hasProvAgent : array 
  }
  class Activity { 
-   wasAssociatedWith : string 
+   wasAssociatedWith : array 
    endedAtTime : string 
    used : string 
    comment : string 
@@ -14,10 +15,16 @@
    value : object 
    wasRevisionOf : string 
    wasGeneratedBy : string 
-   wasAttributedTo : string 
  }
  class Agent { 
    name : string 
+   roleName : string 
+   startDate : string 
+   endDate : string 
+   roleOrder : integer 
+   email : string 
+   url : string 
+   hasIdentifier : array 
  }
 CreateUpdateTombstoneEvent -- Activity 
 CreateUpdateTombstoneEvent -- Entity 
diff --git a/app/templates/includes/resources/diagrams/class-diagrams/data-mapping-full.html b/app/templates/includes/resources/diagrams/class-diagrams/data-mapping-full.html
index 106e716..c67da6f 100644
--- a/app/templates/includes/resources/diagrams/class-diagrams/data-mapping-full.html
+++ b/app/templates/includes/resources/diagrams/class-diagrams/data-mapping-full.html
@@ -2,13 +2,32 @@
  class Mapping { 
    ID : string 
    type : string 
+   status : None 
    version : integer 
    name : string 
    description : string 
    dateCreated : string 
-   dateTombstoned : string 
-   creator : string 
+   creator : object 
    DefaultMapping : array 
    FieldMapping : array 
    mappingDataStandard : None 
+   TombstoneMetadata : object 
  }
+ class TombstoneMetadata { 
+   tombstonedDate : string 
+   tombstonedText : string 
+   TombstonedByAgent : object 
+   hasRelatedPID : array 
+ }
+ class Agent { 
+   name : string 
+   roleName : string 
+   startDate : string 
+   endDate : string 
+   roleOrder : integer 
+   email : string 
+   url : string 
+   hasIdentifier : array 
+ }
+Mapping -- TombstoneMetadata 
+Mapping -- Agent 
diff --git a/app/templates/includes/resources/diagrams/class-diagrams/digital-media-full.html b/app/templates/includes/resources/diagrams/class-diagrams/digital-media-full.html
index d10f8ef..a58c99a 100644
--- a/app/templates/includes/resources/diagrams/class-diagrams/digital-media-full.html
+++ b/app/templates/includes/resources/diagrams/class-diagrams/digital-media-full.html
@@ -2,12 +2,13 @@
  class DigitalMedia { 
    ID : string 
    version : integer 
+   status : None 
    created : string 
    type : string 
    type : None 
    accessURI : string 
-   institutionID : string 
-   institutionName : string 
+   organisationID : string 
+   organisationName : string 
    format : string 
    license : string 
    description : string 
@@ -23,15 +24,16 @@
    hasIdentifier : array 
    hasEntityRelationship : array 
    hasAgent : array 
+   TombstoneMetadata : object 
  }
  class Agent { 
-   agentRole : string 
-   agentType : string 
-   agentID : string 
-   agentName : string 
-   agentRoleBegan : string 
-   agentRoleEnded : string 
-   agentRoleOrder : integer 
+   name : string 
+   roleName : string 
+   startDate : string 
+   endDate : string 
+   roleOrder : integer 
+   email : string 
+   url : string 
    hasIdentifier : array 
  }
  class Assertion { 
@@ -45,8 +47,7 @@
    measurementAccuracy : string 
    measurementUnit : string 
    measurementUnit : string 
-   assertionByAgentName : string 
-   assertionByAgentID : string 
+   AssertionByAgent : object 
    assertionProtocol : string 
    assertionProtocolID : string 
    assertionRemarks : string 
@@ -56,7 +57,7 @@
    type : string 
    date : string 
    title : string 
-   creator : string 
+   creator : object 
    citationPageNumber : string 
    citationRemarks : string 
    referenceType : string 
@@ -72,8 +73,8 @@
    relatedResourceURI : string 
    relationshipEstablishedDate : string 
    entityRelationshipOrder : integer 
+   RelationshipAccordingToAgent : object 
    relationshipAccordingTo : string 
-   relationshipAccordingToID : string 
    relationshipRemarks : string 
  }
  class Identifier { 
@@ -86,8 +87,15 @@
    isBarcodeOrNFC : boolean 
    isIDPersistent : boolean 
  }
+ class TombstoneMetadata { 
+   tombstonedDate : string 
+   tombstonedText : string 
+   TombstonedByAgent : object 
+   hasRelatedPID : array 
+ }
 DigitalMedia -- Agent 
 DigitalMedia -- Assertion 
 DigitalMedia -- Citation 
 DigitalMedia -- EntityRelationship 
 DigitalMedia -- Identifier 
+DigitalMedia -- TombstoneMetadata 
diff --git a/app/templates/includes/resources/diagrams/class-diagrams/digital-specimen-full.html b/app/templates/includes/resources/diagrams/class-diagrams/digital-specimen-full.html
index 3ccf656..f76aa69 100644
--- a/app/templates/includes/resources/diagrams/class-diagrams/digital-specimen-full.html
+++ b/app/templates/includes/resources/diagrams/class-diagrams/digital-specimen-full.html
@@ -2,6 +2,7 @@
  class DigitalSpecimen { 
    ID : string 
    version : integer 
+   status : None 
    created : string 
    type : string 
    midsLevel : integer 
@@ -22,14 +23,14 @@
    basisOfRecord : string 
    preparations : string 
    disposition : string 
-   institutionCode : string 
-   institutionID : string 
-   institutionName : string 
+   organisationCode : string 
+   organisationID : string 
+   organisationName : string 
    collectionCode : string 
    collectionID : string 
    informationWithheld : string 
    dataGeneralizations : string 
-   ownerInstitutionCode : string 
+   ownerOrganisationCode : string 
    recordedBy : string 
    recordedByID : string 
    datasetName : string 
@@ -42,7 +43,7 @@
    organismScope : string 
    associatedOrganisms : string 
    organismRemarks : string 
-   dynamicProperties : object 
+   dynamicProperties : string 
    hasMaterialEntity : array 
    hasIdentification : array 
    hasAssertion : array 
@@ -52,18 +53,19 @@
    hasIdentifier : array 
    hasChronometricAge : array 
    hasAgent : array 
+   TombstoneMetadata : object 
  }
  class MaterialEntity { 
    materialEntityID : string 
    materialEntityType : string 
    preparations : string 
    disposition : string 
-   institutionCode : string 
-   institutionID : string 
-   institutionName : string 
+   organisationCode : string 
+   organisationID : string 
+   organisationName : string 
    collectionCode : string 
    collectionID : string 
-   ownerInstitutionCode : string 
+   ownerOrganisationCode : string 
    recordedBy : string 
    recordedByID : string 
    verbatimLabel : string 
@@ -235,13 +237,13 @@
    bed : string 
  }
  class Agent { 
-   agentRole : string 
-   agentType : string 
-   agentID : string 
-   agentName : string 
-   agentRoleBegan : string 
-   agentRoleEnded : string 
-   agentRoleOrder : integer 
+   name : string 
+   roleName : string 
+   startDate : string 
+   endDate : string 
+   roleOrder : integer 
+   email : string 
+   url : string 
    hasIdentifier : array 
  }
  class Assertion { 
@@ -255,8 +257,7 @@
    measurementAccuracy : string 
    measurementUnit : string 
    measurementUnit : string 
-   assertionByAgentName : string 
-   assertionByAgentID : string 
+   AssertionByAgent : object 
    assertionProtocol : string 
    assertionProtocolID : string 
    assertionRemarks : string 
@@ -266,7 +267,7 @@
    type : string 
    date : string 
    title : string 
-   creator : string 
+   creator : object 
    citationPageNumber : string 
    citationRemarks : string 
    referenceType : string 
@@ -282,8 +283,8 @@
    relatedResourceURI : string 
    relationshipEstablishedDate : string 
    entityRelationshipOrder : integer 
+   RelationshipAccordingToAgent : object 
    relationshipAccordingTo : string 
-   relationshipAccordingToID : string 
    relationshipRemarks : string 
  }
  class Identifier { 
@@ -316,6 +317,12 @@
    chronometricAgeReferences : string 
    chronometricAgeRemarks : string 
  }
+ class TombstoneMetadata { 
+   tombstonedDate : string 
+   tombstonedText : string 
+   TombstonedByAgent : object 
+   hasRelatedPID : array 
+ }
 
     DigitalSpecimen -- MaterialEntity
     DigitalSpecimen -- Identification
@@ -326,6 +333,7 @@
     DigitalSpecimen -- Agent
     DigitalSpecimen -- EntityRelationship
     DigitalSpecimen -- ChronometricAge
+    DigitalSpecimen -- TombstoneMetadata
     Event -- Location
     Event -- Assertion
     Location -- GeoReference
diff --git a/app/templates/includes/resources/diagrams/class-diagrams/machine-annotation-service-full.html b/app/templates/includes/resources/diagrams/class-diagrams/machine-annotation-service-full.html
index 992464f..ab94b58 100644
--- a/app/templates/includes/resources/diagrams/class-diagrams/machine-annotation-service-full.html
+++ b/app/templates/includes/resources/diagrams/class-diagrams/machine-annotation-service-full.html
@@ -2,12 +2,12 @@
  class MachineAnnotationService { 
    ID : string 
    type : string 
+   status : None 
    version : integer 
    name : string 
    description : string 
    dateCreated : string 
-   dateTombstoned : string 
-   creator : string 
+   creator : object 
    containerImage : string 
    containerTag : string 
    TargetDigitalObjectFilter : object 
@@ -15,18 +15,14 @@
    codeRepository : string 
    programmingLanguage : string 
    serviceAvailability : string 
+   maintainer : object 
    license : string 
    dependency : array 
    slaDocumentation : string 
    topicName : string 
    batchingPermitted : boolean 
    timeToLive : integer 
- }
- class maintainer { 
-   identifier : string 
-   name : string 
-   email : string 
-   url : string 
+   TombstoneMetadata : object 
  }
  class ContactPoint { 
    description : string 
@@ -34,5 +30,22 @@
    url : string 
    telephone : string 
  }
-MachineAnnotationService -- maintainer 
+ class TombstoneMetadata { 
+   tombstonedDate : string 
+   tombstonedText : string 
+   TombstonedByAgent : object 
+   hasRelatedPID : array 
+ }
+ class Agent { 
+   name : string 
+   roleName : string 
+   startDate : string 
+   endDate : string 
+   roleOrder : integer 
+   email : string 
+   url : string 
+   hasIdentifier : array 
+ }
 MachineAnnotationService -- ContactPoint 
+MachineAnnotationService -- TombstoneMetadata 
+MachineAnnotationService -- Agent 
diff --git a/app/templates/includes/resources/diagrams/class-diagrams/source-system-full.html b/app/templates/includes/resources/diagrams/class-diagrams/source-system-full.html
index 73de125..9ab89f1 100644
--- a/app/templates/includes/resources/diagrams/class-diagrams/source-system-full.html
+++ b/app/templates/includes/resources/diagrams/class-diagrams/source-system-full.html
@@ -2,14 +2,33 @@
  class SourceSystem { 
    ID : string 
    type : string 
+   status : None 
    version : integer 
    name : string 
    description : string 
    dateCreated : string 
-   dateTombstoned : string 
-   creator : string 
+   creator : object 
    url : string 
    collectionManagementSystem : string 
    translatorType : None 
    dataMappingID : string 
+   TombstoneMetadata : object 
  }
+ class TombstoneMetadata { 
+   tombstonedDate : string 
+   tombstonedText : string 
+   TombstonedByAgent : object 
+   hasRelatedPID : array 
+ }
+ class Agent { 
+   name : string 
+   roleName : string 
+   startDate : string 
+   endDate : string 
+   roleOrder : integer 
+   email : string 
+   url : string 
+   hasIdentifier : array 
+ }
+SourceSystem -- TombstoneMetadata 
+SourceSystem -- Agent 
diff --git a/app/templates/includes/resources/diagrams/er-diagrams/annotation-full.html b/app/templates/includes/resources/diagrams/er-diagrams/annotation-full.html
index 8abcce5..b12218c 100644
--- a/app/templates/includes/resources/diagrams/er-diagrams/annotation-full.html
+++ b/app/templates/includes/resources/diagrams/er-diagrams/annotation-full.html
@@ -3,4 +3,5 @@
   Annotation ||--|| hasBody : Has
   Annotation ||--|| creator : Has
   Annotation ||--|| generator : Has
-  Annotation ||--o| AggregateRating : Has
\ No newline at end of file
+  Annotation ||--o| AggregateRating : Has
+  Annotation ||--o| TombstoneMetadata : Has
\ No newline at end of file
diff --git a/app/templates/includes/resources/diagrams/er-diagrams/create-update-tombstone-event-full.html b/app/templates/includes/resources/diagrams/er-diagrams/create-update-tombstone-event-full.html
index b3a7d50..bd3ddc6 100644
--- a/app/templates/includes/resources/diagrams/er-diagrams/create-update-tombstone-event-full.html
+++ b/app/templates/includes/resources/diagrams/er-diagrams/create-update-tombstone-event-full.html
@@ -1,4 +1,4 @@
 erDiagram
   CreateUpdateTombstoneEvent ||--|| Activity : Has
   CreateUpdateTombstoneEvent ||--|| Entity : Has
-  CreateUpdateTombstoneEvent ||--|| Agent : Has
\ No newline at end of file
+  CreateUpdateTombstoneEvent ||--|{ Agent : Has
\ No newline at end of file
diff --git a/app/templates/includes/resources/diagrams/er-diagrams/data-mapping-full.html b/app/templates/includes/resources/diagrams/er-diagrams/data-mapping-full.html
index eb3afcf..3e87022 100644
--- a/app/templates/includes/resources/diagrams/er-diagrams/data-mapping-full.html
+++ b/app/templates/includes/resources/diagrams/er-diagrams/data-mapping-full.html
@@ -1 +1,3 @@
-erDiagram
\ No newline at end of file
+erDiagram
+  DataMapping ||--o| TombstoneMetadata : Has
+  DataMapping ||--o{ Agent : Has
\ No newline at end of file
diff --git a/app/templates/includes/resources/diagrams/er-diagrams/digital-media-full.html b/app/templates/includes/resources/diagrams/er-diagrams/digital-media-full.html
index 38516ac..9a61e9d 100644
--- a/app/templates/includes/resources/diagrams/er-diagrams/digital-media-full.html
+++ b/app/templates/includes/resources/diagrams/er-diagrams/digital-media-full.html
@@ -4,4 +4,5 @@
   DigitalMedia ||--o{ Citation : Has
   DigitalMedia ||--o{ EntityRelationship : Has
   DigitalMedia ||--o{ Identifier : Has
+  DigitalMedia ||--o| TombstoneMetadata : Has
   Agent ||--o{ Identifier : Has
\ No newline at end of file
diff --git a/app/templates/includes/resources/diagrams/er-diagrams/digital-specimen-full.html b/app/templates/includes/resources/diagrams/er-diagrams/digital-specimen-full.html
index 7c8df52..dc64738 100644
--- a/app/templates/includes/resources/diagrams/er-diagrams/digital-specimen-full.html
+++ b/app/templates/includes/resources/diagrams/er-diagrams/digital-specimen-full.html
@@ -8,6 +8,7 @@
     DigitalSpecimen ||--o{ Agent : Has
     DigitalSpecimen ||--o{ EntityRelationship : Has
     DigitalSpecimen ||--o{ ChronometricAge : Has
+    DigitalSpecimen ||--o| TombstoneMetadata : Has
     Event ||--o| Location : Has
     Event ||--o{ Assertion : Has
     Location ||--o| GeoReference : Has
diff --git a/app/templates/includes/resources/diagrams/er-diagrams/machine-annotation-service-full.html b/app/templates/includes/resources/diagrams/er-diagrams/machine-annotation-service-full.html
index c155f09..a016ac5 100644
--- a/app/templates/includes/resources/diagrams/er-diagrams/machine-annotation-service-full.html
+++ b/app/templates/includes/resources/diagrams/er-diagrams/machine-annotation-service-full.html
@@ -1,3 +1,4 @@
 erDiagram
-  MachineAnnotationService ||--o| maintainer : Has
+  MachineAnnotationService ||--o{ Agent : Has
   MachineAnnotationService ||--o| ContactPoint : Has
+  MachineAnnotationService ||--o| TombstoneMetadata : Has
\ No newline at end of file
diff --git a/app/templates/includes/resources/diagrams/er-diagrams/source-system-full.html b/app/templates/includes/resources/diagrams/er-diagrams/source-system-full.html
index eb3afcf..0fe4886 100644
--- a/app/templates/includes/resources/diagrams/er-diagrams/source-system-full.html
+++ b/app/templates/includes/resources/diagrams/er-diagrams/source-system-full.html
@@ -1 +1,3 @@
-erDiagram
\ No newline at end of file
+erDiagram
+  SourceSystem ||--o| TombstoneMetadata : Has
+  SourceSystem ||--o{ Agent : Has
\ No newline at end of file
diff --git a/app/utils/generation/main.py b/app/utils/generation/main.py
index 3c20806..f30ff79 100644
--- a/app/utils/generation/main.py
+++ b/app/utils/generation/main.py
@@ -72,6 +72,12 @@
                 'class_name': 'ChronometricAge',
                 'class_description': 'The Chronometric Age of the digital specimen',
                 'is_required': False
+            },
+            {
+                'endpoint': 'https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/tombstone-metadata.json',
+                'class_name': 'TombstoneMetadata',
+                'class_description': 'The tombstone metadata about the tombstoned digital object',
+                'is_required': False
             }
         ]
     },
@@ -113,6 +119,12 @@
                 'class_name': 'Identifier',
                 'class_description': 'The Identifier of the digital specimen',
                 'is_required': False
+            },
+            {
+                'endpoint': 'https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/tombstone-metadata.json',
+                'class_name': 'TombstoneMetadata',
+                'class_description': 'The tombstone metadata about the tombstoned digital object',
+                'is_required': False
             }
         ]
     },
@@ -120,10 +132,22 @@
         'csv_prefix': 'machine-annotation-service',
         'objects': [
             {
-                'endpoint': 'https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/mas.json',
+                'endpoint': 'https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/machine-annotation-service.json',
                 'class_name': 'MachineAnnotationService',
                 'class_description': 'A Machine Annotation Service',
                 'is_required': True
+            },
+            {
+                'endpoint': 'https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/tombstone-metadata.json',
+                'class_name': 'TombstoneMetadata',
+                'class_description': 'The tombstone metadata about the tombstoned digital object',
+                'is_required': False
+            },
+            {
+                'endpoint': 'https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/agent.json',
+                'class_name': 'Agent',
+                'class_description': 'Description of the agents connected to the digital object',
+                'is_required': False
             }
         ]
     },
@@ -135,6 +159,18 @@
                 'class_name': 'Annotation',
                 'class_description': 'Annotation model based on the W3C Web Annotation Data Model (https://www.w3.org/TR/annotation-model/)',
                 'is_required': True
+            },
+            {
+                'endpoint': 'https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/tombstone-metadata.json',
+                'class_name': 'TombstoneMetadata',
+                'class_description': 'The tombstone metadata about the tombstoned digital object',
+                'is_required': False
+            },
+            {
+                'endpoint': 'https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/agent.json',
+                'class_name': 'Agent',
+                'class_description': 'Description of the agents connected to the digital object',
+                'is_required': False
             }
         ]
     },
@@ -142,10 +178,16 @@
         'csv_prefix': 'create-update-tombstone-event',
         'objects': [
             {
-                'endpoint': 'https://schemas.dissco.tech/schemas/fdo-type/create-update-tombstone-event/0.3.0/create-update-tombstone.json',
+                'endpoint': 'https://schemas.dissco.tech/schemas/fdo-type/create-update-tombstone-event/0.3.0/create-update-tombstone-event.json',
                 'class_name': 'CreateUpdateTombstoneEvent',
                 'class_description': 'Create Update Tombstone Event, based on W3C PROV Data Model (https://www.w3.org/TR/prov-o/)',
                 'is_required': True
+            },
+            {
+                'endpoint': 'https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/agent.json',
+                'class_name': 'Agent',
+                'class_description': 'Description of the agents connected to the digital object',
+                'is_required': False
             }
         ]
     },
@@ -157,6 +199,18 @@
                 'class_name': 'Mapping',
                 'class_description': 'Mapping data model, used for data-mapping between different data models',
                 'is_required': True
+            },
+            {
+                'endpoint': 'https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/tombstone-metadata.json',
+                'class_name': 'TombstoneMetadata',
+                'class_description': 'The tombstone metadata about the tombstoned digital object',
+                'is_required': False
+            },
+            {
+                'endpoint': 'https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/agent.json',
+                'class_name': 'Agent',
+                'class_description': 'Description of the agents connected to the digital object',
+                'is_required': False
             }
         ]
     },
@@ -168,6 +222,18 @@
                 'class_name': 'SourceSystem',
                 'class_description': 'Source System Model, used to describe data providing systems',
                 'is_required': True
+            },
+            {
+                'endpoint': 'https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/tombstone-metadata.json',
+                'class_name': 'TombstoneMetadata',
+                'class_description': 'The tombstone metadata about the tombstoned digital object',
+                'is_required': False
+            },
+            {
+                'endpoint': 'https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/agent.json',
+                'class_name': 'Agent',
+                'class_description': 'Description of the agents connected to the digital object',
+                'is_required': False
             }
         ]
     }
@@ -357,6 +423,7 @@ def add_digital_specimen_relationships(mermaid_string):
     DigitalSpecimen -- Agent
     DigitalSpecimen -- EntityRelationship
     DigitalSpecimen -- ChronometricAge
+    DigitalSpecimen -- TombstoneMetadata
     Event -- Location
     Event -- Assertion
     Location -- GeoReference