diff --git a/productMods/WEB-INF/ontologies/update/diff.tab.txt b/productMods/WEB-INF/ontologies/update/diff.tab.txt
index 21619990..4e18a4b7 100644
--- a/productMods/WEB-INF/ontologies/update/diff.tab.txt
+++ b/productMods/WEB-INF/ontologies/update/diff.tab.txt
@@ -1 +1 @@
-http://purl.org/NET/c4dm/event.owl#agent			Delete	z
http://purl.org/NET/c4dm/event.owl#isAgentIn			Delete	z
http://purl.org/NET/c4dm/event.owl#produced_in	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://purl.org/NET/c4dm/event.owl#product	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://purl.org/dc/elements/1.1/isVersionOf			Delete	z
http://vivoweb.org/ontology/core#administeredBy			Delete	complex construct with grant administrator role
http://purl.org/dc/terms/isReferencedBy			Delete	z
http://purl.org/dc/terms/isVersionOf			Delete	z
http://purl.org/dc/terms/publisher	http://vivoweb.org/ontology/core#publisher	Yes		z
http://purl.org/ontology/bibo/editor			Delete	z
http://vivoweb.org/ontology/core#administers			Delete	complex construct with grant administrator role
http://vivoweb.org/ontology/core#advisee			Delete	CC - advising relationship plus add advisee role
http://vivoweb.org/ontology/core#adviseeIn			Delete	CC - advising relationship plus add advisee role
http://vivoweb.org/ontology/core#advisingContributionTo			Delete	construct
http://vivoweb.org/ontology/core#advisor			Delete	CC - advising relationship plus add advisor role
http://vivoweb.org/ontology/core#advisorIn			Delete	CC - advising relationship plus add advisor role
http://vivoweb.org/ontology/core#associatedRole	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#associatedWithPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#attendeeRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#authorInAuthorship	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#awardConferred	http://vivoweb.org/ontology/core#assigns	Yes		z
http://vivoweb.org/ontology/core#awardConferredBy	http://vivoweb.org/ontology/core#assignedBy	Yes		z
http://vivoweb.org/ontology/core#awardOrHonor	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#awardOrHonorFor	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#awardsGrant	http://vivoweb.org/ontology/core#assigns	Yes		z
http://vivoweb.org/ontology/core#clinicalRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#co-PrincipalInvestigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#courseOfferedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#credentialOf	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#currentMemberOf			Delete	construct MemberRole
http://vivoweb.org/ontology/core#currentlyHeadOf			Delete	construct LeaderRole
http://vivoweb.org/ontology/core#currentlyHeadedBy			Delete	construct LeaderRole
http://vivoweb.org/ontology/core#degreeEarned	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#degreeOfferedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#degreeOutcomeOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#domesticGeographicFocus	http://vivoweb.org/ontology/core#geographicFocus	Yes		z
http://vivoweb.org/ontology/core#domesticGeographicFocusOf	http://vivoweb.org/ontology/core#geographicFocusOf	Yes		z
http://vivoweb.org/ontology/core#editor			Delete	CC editorship
http://vivoweb.org/ontology/core#editorOf			Delete	CC editorship
http://vivoweb.org/ontology/core#editorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#educationalTraining	http://purl.obolibrary.org/obo/RO_0000056	Yes		z
http://vivoweb.org/ontology/core#educationalTrainingOf	http://purl.obolibrary.org/obo/RO_0000057	Yes		z
http://vivoweb.org/ontology/core#equipmentInFacility	http://purl.obolibrary.org/obo/RO_0001025	Yes		"""located in"""
http://vivoweb.org/ontology/core#eventWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		"""part of"""
http://vivoweb.org/ontology/core#geographicLocationOf	http://purl.obolibrary.org/obo/RO_0001015	Yes		"""location of"""
http://vivoweb.org/ontology/core#geographicallyContains	http://purl.obolibrary.org/obo/BFO_0000051	Yes		"""has part"""
http://vivoweb.org/ontology/core#geographicallyWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#grantAwardedBy	http://vivoweb.org/ontology/core#assignedBy	Yes		z
http://vivoweb.org/ontology/core#hasAttendeeRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasAttendeeRoleContext
http://vivoweb.org/ontology/core#hasClinicalRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasClinicalRoleContext
http://vivoweb.org/ontology/core#hasCo-PrincipalInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasCo-PrincipalInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasCredential	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#hasCurrentMember			Delete	construct MemberRole
http://vivoweb.org/ontology/core#hasEditorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasEditorRoleContext
http://vivoweb.org/ontology/core#hasGeographicLocation	http://purl.obolibrary.org/obo/RO_0001025	Yes		"""located in"""
http://vivoweb.org/ontology/core#hasInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasLeaderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasLeaderRoleContext
http://vivoweb.org/ontology/core#hasMemberRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasMemberRoleContext
http://vivoweb.org/ontology/core#hasOrganizerRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasOrganizerRoleContext
http://vivoweb.org/ontology/core#hasOutreachProviderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasOutreachProviderContext
http://vivoweb.org/ontology/core#hasPart	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasPresenterRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasPresenterRoleContext
http://vivoweb.org/ontology/core#hasPrincipalInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasPrincipalInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasResearcherRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasResearcherRoleContext
http://vivoweb.org/ontology/core#hasReviewerRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasReviewerRoleContext
http://vivoweb.org/ontology/core#hasRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		z
http://vivoweb.org/ontology/core#hasRoom	http://purl.obolibrary.org/obo/BFO_0000051	Yes		"""has part"""
http://vivoweb.org/ontology/core#hasServiceProviderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasServiceProviderRoleContext
http://vivoweb.org/ontology/core#hasSubGrant	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasSubOrganization	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasTeacherRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		z
http://vivoweb.org/ontology/core#inEventSeries	http://purl.obolibrary.org/obo/BFO_0000050	Yes		"""part of"""
http://vivoweb.org/ontology/core#includesEvent	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#informationProduct	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#informationProductOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#informationResourceInAuthorship	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#internationalGeographicFocus	http://vivoweb.org/ontology/core#geographicFocus	Yes		z
http://vivoweb.org/ontology/core#internationalGeographicFocusOf	http://vivoweb.org/ontology/core#geographicFocusOf	Yes		z
http://vivoweb.org/ontology/core#investigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		"""inheres in"""
http://vivoweb.org/ontology/core#issuanceOfCredential	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#issuedCredential	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#leaderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#linkedAuthor	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#linkedInformationResource	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#locationOfEquipment	http://purl.obolibrary.org/obo/RO_0001015	Yes		z
http://vivoweb.org/ontology/core#mailingAddress			Delete	VCard
http://vivoweb.org/ontology/core#mailingAddressFor			Delete	VCard
http://vivoweb.org/ontology/core#memberRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#offersCourse	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#offersDegree	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#organizationForPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#organizationForTraining	http://purl.obolibrary.org/obo/RO_0000056	Yes		z
http://vivoweb.org/ontology/core#organizerRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#outcome	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#outcomeOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#outreachProviderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#partOf	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#personInPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#positionForPerson	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#positionInOrganization	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#presenterRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#principalInvestigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#providesService	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#realizedRole	http://purl.obolibrary.org/obo/BFO_0000055	Yes		"""realizes"""
http://vivoweb.org/ontology/core#receipt	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#receiptOf	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#relatedRole	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#researcherRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#reviewerRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#roleIn	http://purl.obolibrary.org/obo/BFO_0000054	Yes		"""realized in"" (or delete, since there should be subs?)"
http://vivoweb.org/ontology/core#roleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#roleRealizedIn	http://purl.obolibrary.org/obo/BFO_0000054	Yes		z
http://vivoweb.org/ontology/core#roomWithinBuilding	http://purl.obolibrary.org/obo/RO_0001025	Yes		z
http://vivoweb.org/ontology/core#seriesForEvent	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#serviceProvidedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#serviceProviderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#subGrantOf	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#subOrganizationWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#teacherRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#trainingAtOrganization	http://purl.obolibrary.org/obo/RO_0000057	Yes		z
http://vivoweb.org/ontology/core#authorRank	http://vivoweb.org/ontology/core#rank	Yes		z
http://vivoweb.org/ontology/core#preferredTitle			Delete	z
http://vivoweb.org/ontology/core#EducationalTraining	http://vivoweb.org/ontology/core#EducationalProcess	Yes		z
http://vivoweb.org/ontology/core#ServiceProviderRole	http://purl.obolibrary.org/obo/ERO_0000012	Yes		z
http://vivoweb.org/ontology/core#URLLink	http://www.w3.org/2006/vcard/ns#URL	Yes		z
http://vivoweb.org/ontology/core#Agreement			Delete	z
http://vivoweb.org/ontology/core#InformationResource	http://purl.obolibrary.org/obo/IAO_0000030	Yes		z
http://vivoweb.org/ontology/core#Service	http://purl.obolibrary.org/obo/ERO_0000005	Yes		z
http://vivoweb.org/ontology/core#Software	http://purl.obolibrary.org/obo/ERO_0000071	Yes		z
http://vivoweb.org/ontology/core#Dataset	http://purl.obolibrary.org/obo/TODO_Dataset	Yes		z
\ No newline at end of file
+http://purl.org/NET/c4dm/event.owl#agent			Delete	z
http://purl.org/NET/c4dm/event.owl#isAgentIn			Delete	z
http://purl.org/NET/c4dm/event.owl#produced_in	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://purl.org/NET/c4dm/event.owl#product	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://purl.org/dc/elements/1.1/isVersionOf			Delete	z
http://vivoweb.org/ontology/core#administeredBy			Delete	complex construct with grant administrator role
http://purl.org/dc/terms/isReferencedBy			Delete	z
http://purl.org/dc/terms/isVersionOf			Delete	z
http://purl.org/dc/terms/publisher	http://vivoweb.org/ontology/core#publisher	Yes		z
http://purl.org/ontology/bibo/editor			Delete	z
http://vivoweb.org/ontology/core#administers			Delete	complex construct with grant administrator role
http://vivoweb.org/ontology/core#advisee			Delete	CC - advising relationship plus add advisee role
http://vivoweb.org/ontology/core#adviseeIn			Delete	CC - advising relationship plus add advisee role
http://vivoweb.org/ontology/core#advisingContributionTo			Delete	construct
http://vivoweb.org/ontology/core#advisor			Delete	CC - advising relationship plus add advisor role
http://vivoweb.org/ontology/core#advisorIn			Delete	CC - advising relationship plus add advisor role
http://vivoweb.org/ontology/core#associatedRole	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#associatedWithPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#attendeeRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#authorInAuthorship	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#awardConferred	http://vivoweb.org/ontology/core#assigns	Yes		z
http://vivoweb.org/ontology/core#awardConferredBy	http://vivoweb.org/ontology/core#assignedBy	Yes		z
http://vivoweb.org/ontology/core#awardOrHonor	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#awardOrHonorFor	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#awardsGrant	http://vivoweb.org/ontology/core#assigns	Yes		z
http://vivoweb.org/ontology/core#clinicalRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#co-PrincipalInvestigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#courseOfferedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#credentialOf	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#currentMemberOf			Delete	construct MemberRole
http://vivoweb.org/ontology/core#currentlyHeadOf			Delete	construct LeaderRole
http://vivoweb.org/ontology/core#currentlyHeadedBy			Delete	construct LeaderRole
http://vivoweb.org/ontology/core#degreeEarned	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#degreeOfferedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#degreeOutcomeOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#domesticGeographicFocus	http://vivoweb.org/ontology/core#geographicFocus	Yes		z
http://vivoweb.org/ontology/core#domesticGeographicFocusOf	http://vivoweb.org/ontology/core#geographicFocusOf	Yes		z
http://vivoweb.org/ontology/core#editor			Delete	CC editorship
http://vivoweb.org/ontology/core#editorOf			Delete	CC editorship
http://vivoweb.org/ontology/core#editorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#educationalTraining	http://purl.obolibrary.org/obo/RO_0000056	Yes		z
http://vivoweb.org/ontology/core#educationalTrainingOf	http://purl.obolibrary.org/obo/RO_0000057	Yes		z
http://vivoweb.org/ontology/core#equipmentInFacility	http://purl.obolibrary.org/obo/RO_0001025	Yes		"""located in"""
http://vivoweb.org/ontology/core#eventWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		"""part of"""
http://vivoweb.org/ontology/core#geographicLocationOf	http://purl.obolibrary.org/obo/RO_0001015	Yes		"""location of"""
http://vivoweb.org/ontology/core#geographicallyContains	http://purl.obolibrary.org/obo/BFO_0000051	Yes		"""has part"""
http://vivoweb.org/ontology/core#geographicallyWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#grantAwardedBy	http://vivoweb.org/ontology/core#assignedBy	Yes		z
http://vivoweb.org/ontology/core#hasAttendeeRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasAttendeeRoleContext
http://vivoweb.org/ontology/core#hasClinicalRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasClinicalRoleContext
http://vivoweb.org/ontology/core#hasCo-PrincipalInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasCo-PrincipalInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasCredential	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#hasCurrentMember			Delete	construct MemberRole
http://vivoweb.org/ontology/core#hasEditorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasEditorRoleContext
http://vivoweb.org/ontology/core#hasGeographicLocation	http://purl.obolibrary.org/obo/RO_0001025	Yes		"""located in"""
http://vivoweb.org/ontology/core#hasInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasLeaderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasLeaderRoleContext
http://vivoweb.org/ontology/core#hasMemberRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasMemberRoleContext
http://vivoweb.org/ontology/core#hasOrganizerRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasOrganizerRoleContext
http://vivoweb.org/ontology/core#hasOutreachProviderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasOutreachProviderContext
http://vivoweb.org/ontology/core#hasPart	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasPresenterRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasPresenterRoleContext
http://vivoweb.org/ontology/core#hasPrincipalInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasPrincipalInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasResearcherRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasResearcherRoleContext
http://vivoweb.org/ontology/core#hasReviewerRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasReviewerRoleContext
http://vivoweb.org/ontology/core#hasRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		z
http://vivoweb.org/ontology/core#hasRoom	http://purl.obolibrary.org/obo/BFO_0000051	Yes		"""has part"""
http://vivoweb.org/ontology/core#hasServiceProviderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasServiceProviderRoleContext
http://vivoweb.org/ontology/core#hasSubGrant	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasSubOrganization	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasTeacherRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		z
http://vivoweb.org/ontology/core#inEventSeries	http://purl.obolibrary.org/obo/BFO_0000050	Yes		"""part of"""
http://vivoweb.org/ontology/core#includesEvent	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#informationProduct	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#informationProductOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#informationResourceInAuthorship	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#internationalGeographicFocus	http://vivoweb.org/ontology/core#geographicFocus	Yes		z
http://vivoweb.org/ontology/core#internationalGeographicFocusOf	http://vivoweb.org/ontology/core#geographicFocusOf	Yes		z
http://vivoweb.org/ontology/core#investigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		"""inheres in"""
http://vivoweb.org/ontology/core#issuanceOfCredential	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#issuedCredential	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#leaderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#linkedAuthor	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#linkedInformationResource	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#locationOfEquipment	http://purl.obolibrary.org/obo/RO_0001015	Yes		z
http://vivoweb.org/ontology/core#mailingAddress			Delete	VCard
http://vivoweb.org/ontology/core#mailingAddressFor			Delete	VCard
http://vivoweb.org/ontology/core#memberRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#offersCourse	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#offersDegree	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#organizationForPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#organizationForTraining	http://purl.obolibrary.org/obo/RO_0000056	Yes		z
http://vivoweb.org/ontology/core#organizerRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#outcome	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#outcomeOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#outreachProviderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#partOf	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#personInPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#positionForPerson	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#positionInOrganization	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#presenterRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#principalInvestigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#providesService	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#realizedRole	http://purl.obolibrary.org/obo/BFO_0000055	Yes		"""realizes"""
http://vivoweb.org/ontology/core#receipt	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#receiptOf	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#relatedRole	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#researcherRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#reviewerRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#roleIn	http://purl.obolibrary.org/obo/BFO_0000054	Yes		"""realized in"" (or delete, since there should be subs?)"
http://vivoweb.org/ontology/core#roleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#roleRealizedIn	http://purl.obolibrary.org/obo/BFO_0000054	Yes		z
http://vivoweb.org/ontology/core#roomWithinBuilding	http://purl.obolibrary.org/obo/RO_0001025	Yes		z
http://vivoweb.org/ontology/core#seriesForEvent	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#serviceProvidedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#serviceProviderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#subGrantOf	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#subOrganizationWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#teacherRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#trainingAtOrganization	http://purl.obolibrary.org/obo/RO_0000057	Yes		z
http://vivoweb.org/ontology/core#authorRank	http://vivoweb.org/ontology/core#rank	Yes		z
http://vivoweb.org/ontology/core#preferredTitle			Delete	z
http://vivoweb.org/ontology/core#EducationalTraining	http://vivoweb.org/ontology/core#EducationalProcess	Yes		z
http://vivoweb.org/ontology/core#ServiceProviderRole	http://purl.obolibrary.org/obo/ERO_0000012	Yes		z
http://vivoweb.org/ontology/core#URLLink	http://www.w3.org/2006/vcard/ns#URL	Yes		z
http://vivoweb.org/ontology/core#Agreement			Delete	z
http://vivoweb.org/ontology/core#InformationResource	http://purl.obolibrary.org/obo/IAO_0000030	Yes		z
http://vivoweb.org/ontology/core#Service	http://purl.obolibrary.org/obo/ERO_0000005	Yes		z
http://vivoweb.org/ontology/core#Software	http://purl.obolibrary.org/obo/ERO_0000071	Yes		z
\ No newline at end of file
diff --git a/productMods/config/listViewConfig-relatedRole.xml b/productMods/config/listViewConfig-relatedRole.xml
index fa9f6b17..f2d8e3cd 100644
--- a/productMods/config/listViewConfig-relatedRole.xml
+++ b/productMods/config/listViewConfig-relatedRole.xml
@@ -36,9 +36,9 @@
             OPTIONAL { ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole .
                        ?indivInRole rdfs:label ?indivLabel 
             }
-            OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000055> ?indivInRole .
+            OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?indivInRole .
             }
-            OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000055> ?indivInRole .
+            OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?indivInRole .
                        ?indivInRole rdfs:label ?indivLabel 
             }
 
@@ -92,7 +92,7 @@
             } UNION {
                ?subject ?property ?role .
                ?role a ?objectType .
-               ?role <http://purl.obolibrary.org/obo/BFO_0000055> ?indivInRole .
+               ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?indivInRole .
                ?indivInRole rdfs:label ?indivLabel
             }
         } 
diff --git a/productMods/config/listViewConfig-roleContributesTo.xml b/productMods/config/listViewConfig-roleContributesTo.xml
index 6cc74045..9bac8394 100644
--- a/productMods/config/listViewConfig-roleContributesTo.xml
+++ b/productMods/config/listViewConfig-roleContributesTo.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt -->
+<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt 
+     This list view used for both roleContributesTo and BFO_0000054, which
+     is for events.
+-->
 
 <list-view-config>
     <query-select>    
@@ -31,6 +34,13 @@
                         ?activity vitro:mostSpecificType ?subclass   
                         </collated>
             }           
+            OPTIONAL {  ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
+                        ?activity rdfs:label ?activityLabel 
+                        
+                        <collated>
+                        ?activity vitro:mostSpecificType ?subclass   
+                        </collated>
+            }           
             OPTIONAL { ?role rdfs:label ?roleLabel }
             OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval .
                        ?dateTimeInterval core:start ?dateTimeStartValue .
@@ -61,6 +71,24 @@
         }
     </query-construct>
 
+    <query-construct>
+        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;  
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;          
+        PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
+        
+        CONSTRUCT {
+            ?subject ?property ?role .
+            ?role a ?objectType .
+            ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
+            ?activity vitro:mostSpecificType ?subclass .
+        } WHERE {
+            ?subject ?property ?role .
+            ?role a ?objectType .
+            ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
+            ?activity vitro:mostSpecificType ?subclass
+        }
+    </query-construct>
+
     <query-construct>
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;    
diff --git a/rdf/tbox/filegraph/dataset.owl b/rdf/tbox/filegraph/dataset.owl
index 27447d06..73a5a06a 100644
--- a/rdf/tbox/filegraph/dataset.owl
+++ b/rdf/tbox/filegraph/dataset.owl
@@ -10,9 +10,9 @@
      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:core="http://vivoweb.org/ontology/core#">
 
- <!-- http://purl.obolibrary.org/obo/TODO_Dataset -->
+ <!-- http://vivoweb.org/ontology/core#Dataset -->
  
-     <owl:Class rdf:about="http://purl.obolibrary.org/obo/TODO_Dataset">
+     <owl:Class rdf:about="http://vivoweb.org/ontology/core#Dataset">
  
          <rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Document"/>
              <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A named collection of data, usually containing only one type of data</obo:IAO_0000115>
@@ -31,7 +31,7 @@
          <rdfs:subClassOf>
             <owl:Restriction>
                 <owl:onProperty rdf:resource="http://purl.org/spar/cito/citesAsDataSource"/>
-                <owl:allValuesFrom rdf:resource="http://purl.obolibrary.org/obo/TODO_Dataset"/>
+                <owl:allValuesFrom rdf:resource="http://vivoweb.org/ontology/core#Dataset"/>
             </owl:Restriction>
          </rdfs:subClassOf>
 </owl:Class>
diff --git a/rdf/tbox/filegraph/linkSuppression.n3 b/rdf/tbox/filegraph/linkSuppression.n3
index 74cf53bd..46ba42db 100644
--- a/rdf/tbox/filegraph/linkSuppression.n3
+++ b/rdf/tbox/filegraph/linkSuppression.n3
@@ -10,3 +10,4 @@ core:hasResearchArea config:deleteLinkSuppressed "true"^^xsd:boolean .
 core:researchAreaOf config:deleteLinkSuppressed "true"^^xsd:boolean .
 core:hasSubjectArea config:deleteLinkSuppressed "true"^^xsd:boolean .
 core:subjectAreaFor config:deleteLinkSuppressed "true"^^xsd:boolean .
+core:geographicFocusOf config:editLinkSuppressed "true"^^xsd:boolean .
\ No newline at end of file
diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3
index 3d8e4d9b..03ba4d54 100644
--- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3
+++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3
@@ -1586,7 +1586,7 @@ geo:population
 vcard:Geographical
       rdfs:label "Geographical"@en-US .
 
-obo:TODO_Dataset
+vivo:Dataset
       rdfs:label "Dataset"@en-US ;
       vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouppublications> ;
       vitro:displayLimitAnnot
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java
index 96719826..7b429d3b 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java
@@ -1,68 +1,68 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
-
-public class AddOrganizerRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
-	
-	private static String template = "addOrganizerRoleToPerson.ftl";
-	
-    
-	@Override
-	String getTemplate() {
-		return template;
-	}
-
-	@Override
-	String getRoleType() {
-		return "http://vivoweb.org/ontology/core#OrganizerRole";
-	}
-	
-	//Organizer role involves hard-coded options for the "right side" of the role or activity
-    @Override
-    FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
-		return new ConstantFieldOptions(
-        "","Select type",
-        "http://purl.org/NET/c4dm/event.owl#Event", "Event",
-        "http://vivoweb.org/ontology/core#Competition", "Competition",
-        "http://purl.org/ontology/bibo/Conference", "Conference",
-        "http://vivoweb.org/ontology/core#Course", "Course",
-        "http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
-        "http://purl.org/ontology/bibo/Hearing", "Hearing",
-        "http://purl.org/ontology/bibo/Interview", "Interview",
-        "http://vivoweb.org/ontology/core#Meeting", "Meeting",
-        "http://purl.org/ontology/bibo/Performance", "Performance",
-        "http://vivoweb.org/ontology/core#Presentation", "Presentation",
-        "http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
-        "http://purl.org/ontology/bibo/Workshop", "Workshop",
-        "http://vivoweb.org/ontology/core#EventSeries", "Event Series",
-        "http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series",
-        "http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series",
-        "http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series");
-	}
-
-	@Override
-	boolean isShowRoleLabelField() {
-		return false;
-	}
-       /* 
-        * Use the methods below to change the date/time precision in the
-        * custom form associated with this generator. When not used, the
-        * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
-        * MINUTE, TIME and NONE.
-        */
-    /*
-        public String getStartDatePrecision() {
-            String precision = VitroVocabulary.Precision.MONTH.uri();
-    	    return precision;
-        }
-
-        public String getEndDatePrecision() {
-            String precision = VitroVocabulary.Precision.DAY.uri();
-    	    return precision;
-        }
-    */    
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
+
+public class AddOrganizerRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
+	
+	private static String template = "addOrganizerRoleToPerson.ftl";
+	
+    
+	@Override
+	String getTemplate() {
+		return template;
+	}
+
+	@Override
+	String getRoleType() {
+		return "http://vivoweb.org/ontology/core#OrganizerRole";
+	}
+	
+	//Organizer role involves hard-coded options for the "right side" of the role or activity
+    @Override
+    FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
+		return new ConstantFieldOptions(
+        "","Select type",
+        "http://vivoweb.org/ontology/core#Competition", "Competition",
+        "http://purl.org/ontology/bibo/Conference", "Conference",
+        "http://vivoweb.org/ontology/core#Course", "Course",
+        "http://purl.org/NET/c4dm/event.owl#Event", "Event",
+        "http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
+        "http://purl.org/ontology/bibo/Hearing", "Hearing",
+        "http://purl.org/ontology/bibo/Interview", "Interview",
+        "http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
+        "http://vivoweb.org/ontology/core#Meeting", "Meeting",
+        "http://purl.org/ontology/bibo/Performance", "Performance",
+        "http://vivoweb.org/ontology/core#Presentation", "Presentation",
+        "http://purl.org/ontology/bibo/Workshop", "Workshop",
+        "http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series",
+        "http://vivoweb.org/ontology/core#EventSeries", "Event Series",
+        "http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series",
+        "http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series");
+	}
+
+	@Override
+	boolean isShowRoleLabelField() {
+		return false;
+	}
+       /* 
+        * Use the methods below to change the date/time precision in the
+        * custom form associated with this generator. When not used, the
+        * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
+        * MINUTE, TIME and NONE.
+        */
+    /*
+        public String getStartDatePrecision() {
+            String precision = VitroVocabulary.Precision.MONTH.uri();
+    	    return precision;
+        }
+
+        public String getEndDatePrecision() {
+            String precision = VitroVocabulary.Precision.DAY.uri();
+    	    return precision;
+        }
+    */    
+}
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
index 55daf34d..733b71e3 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
@@ -33,33 +33,48 @@ public class AddOutreachProviderRoleToPersonGenerator extends AddRoleToPersonTwo
             "http://vivoweb.org/ontology/core#College","College",
             "http://vivoweb.org/ontology/core#Committee","Committee",
             "http://vivoweb.org/ontology/core#Company","Company",
+            "http://vivoweb.org/ontology/core#Competition", "Competition",
+            "http://purl.org/ontology/bibo/Conference", "Conference",
+            "http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series",
             "http://vivoweb.org/ontology/core#Consortium","Consortium",
             "http://vivoweb.org/ontology/core#CoreLaboratory","Core Laboratory",
+            "http://vivoweb.org/ontology/core#Course", "Course",
             "http://vivoweb.org/ontology/core#Department","Department",
             "http://vivoweb.org/ontology/core#Division","Division",
             "http://purl.org/NET/c4dm/event.owl#Event","Event",
+            "http://vivoweb.org/ontology/core#EventSeries", "Event Series",
+            "http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
             "http://vivoweb.org/ontology/core#ExtensionUnit","Extension Unit",
             "http://vivoweb.org/ontology/core#Foundation","Foundation",
             "http://vivoweb.org/ontology/core#FundingOrganization","Funding Organization",
             "http://vivoweb.org/ontology/core#GovernmentAgency","Government Agency",
             "http://xmlns.com/foaf/0.1/Group","Group",
+            "http://purl.org/ontology/bibo/Hearing", "Hearing",
             "http://vivoweb.org/ontology/core#Hospital","Hospital",
             "http://vivoweb.org/ontology/core#Institute","Institute",
+            "http://purl.org/ontology/bibo/Interview", "Interview",
+            "http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
             "http://vivoweb.org/ontology/core#Laboratory","Laboratory",
             "http://vivoweb.org/ontology/core#Library","Library",
             "http://purl.obolibrary.org/obo/OBI_0000835","Manufacturer",
+            "http://vivoweb.org/ontology/core#Meeting", "Meeting",
             "http://vivoweb.org/ontology/core#Museum","Museum",
             "http://xmlns.com/foaf/0.1/Organization","Organization",
+            "http://purl.org/ontology/bibo/Performance", "Performance",
+            "http://vivoweb.org/ontology/core#Presentation", "Presentation",
             "http://vivoweb.org/ontology/core#PrivateCompany","Private Company",
             "http://vivoweb.org/ontology/core#Program","Program",
             "http://vivoweb.org/ontology/core#Publisher","Publisher",
             "http://vivoweb.org/ontology/core#ResearchOrganization","Research Organization",
             "http://vivoweb.org/ontology/core#School","School",
+            "http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series",
             "http://vivoweb.org/ontology/core#Team","Team",
             "http://vivoweb.org/ontology/core#ServiceProvidingLaboratory","Service Providing Lab",
             "http://vivoweb.org/ontology/core#StudentOrganization","Student Organization",
             "http://purl.obolibrary.org/obo/ERO_0000565","Technology Transfer Office",
-            "http://vivoweb.org/ontology/core#University","University");
+            "http://vivoweb.org/ontology/core#University","University",
+            "http://purl.org/ontology/bibo/Workshop", "Workshop",
+            "http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series");
 	}
 
 	@Override
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java
index 0ba33d46..28264702 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java
@@ -902,7 +902,7 @@ public class AddPublicationToPersonGenerator extends VivoBaseGenerator implement
         literalOptions.add(list("http://vivoweb.org/ontology/core#ConferencePaper", "Conference Paper"));
         literalOptions.add(list("http://vivoweb.org/ontology/core#ConferencePoster", "Conference Poster"));
         literalOptions.add(list("http://vivoweb.org/ontology/core#Database", "Database"));
-        literalOptions.add(list("http://purl.obolibrary.org/obo/TODO_Dataset", "Dataset"));
+        literalOptions.add(list("http://vivoweb.org/ontology/core#Dataset", "Dataset"));
         literalOptions.add(list("http://purl.org/ontology/bibo/EditedBook", "Edited Book"));
         literalOptions.add(list("http://vivoweb.org/ontology/core#EditorialArticle", "Editorial Article"));
         literalOptions.add(list("http://purl.org/ontology/bibo/Film", "Film"));
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
index 3e3d80a2..174d299d 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
@@ -31,33 +31,48 @@ FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
         "http://vivoweb.org/ontology/core#College","College",
         "http://vivoweb.org/ontology/core#Committee","Committee",
         "http://vivoweb.org/ontology/core#Company","Company",
+        "http://vivoweb.org/ontology/core#Competition", "Competition",
+        "http://purl.org/ontology/bibo/Conference", "Conference",
+        "http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series",
         "http://vivoweb.org/ontology/core#Consortium","Consortium",
         "http://vivoweb.org/ontology/core#CoreLaboratory","Core Laboratory",
+        "http://vivoweb.org/ontology/core#Course", "Course",
         "http://vivoweb.org/ontology/core#Department","Department",
         "http://vivoweb.org/ontology/core#Division","Division",
         "http://purl.org/NET/c4dm/event.owl#Event","Event",
+        "http://vivoweb.org/ontology/core#EventSeries", "Event Series",
+        "http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
         "http://vivoweb.org/ontology/core#ExtensionUnit","Extension Unit",
         "http://vivoweb.org/ontology/core#Foundation","Foundation",
         "http://vivoweb.org/ontology/core#FundingOrganization","Funding Organization",
         "http://vivoweb.org/ontology/core#GovernmentAgency","Government Agency",
         "http://xmlns.com/foaf/0.1/Group","Group",
+        "http://purl.org/ontology/bibo/Hearing", "Hearing",
         "http://vivoweb.org/ontology/core#Hospital","Hospital",
         "http://vivoweb.org/ontology/core#Institute","Institute",
+        "http://purl.org/ontology/bibo/Interview", "Interview",
+        "http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
         "http://vivoweb.org/ontology/core#Laboratory","Laboratory",
         "http://vivoweb.org/ontology/core#Library","Library",
         "http://purl.obolibrary.org/obo/OBI_0000835","Manufacturer",
+        "http://vivoweb.org/ontology/core#Meeting", "Meeting",
         "http://vivoweb.org/ontology/core#Museum","Museum",
         "http://xmlns.com/foaf/0.1/Organization","Organization",
+        "http://purl.org/ontology/bibo/Performance", "Performance",
+        "http://vivoweb.org/ontology/core#Presentation", "Presentation",
         "http://vivoweb.org/ontology/core#PrivateCompany","Private Company",
         "http://vivoweb.org/ontology/core#Program","Program",
         "http://vivoweb.org/ontology/core#Publisher","Publisher",
         "http://vivoweb.org/ontology/core#ResearchOrganization","Research Organization",
         "http://vivoweb.org/ontology/core#School","School",
+        "http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series",
         "http://vivoweb.org/ontology/core#Team","Team",
         "http://vivoweb.org/ontology/core#ServiceProvidingLaboratory","Service Providing Lab",
         "http://vivoweb.org/ontology/core#StudentOrganization","Student Organization",
         "http://purl.obolibrary.org/obo/ERO_0000565","Technology Transfer Office",
-        "http://vivoweb.org/ontology/core#University","University");
+        "http://vivoweb.org/ontology/core#University","University",
+        "http://purl.org/ontology/bibo/Workshop", "Workshop",
+        "http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series");
 }
 	
 	@Override