diff --git a/Makefile b/Makefile
index 657e443..c055b6c 100644
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,8 @@ nmanual/img/n4o-all-classes.svg: voc/crm-classes.pg voc/n4o-classes.pg
 crm-expand.txt: crm-expand.tsv
 	./expansion-list.pl < $< | sort > $@
 
-crm-expand.tsv: voc/crm-classes.pg
-	pgraph $< | jq -r 'select(.type=="edge" and any(.labels[]; .=="replacedBy" or .=="superClass"))|[.from,.to]|@tsv' > $@
-	pgraph $< | jq -r 'select(.type=="node" and .properties.alias)|[.properties.alias[0],.id]|@tsv' >> $@
+crm-expand.tsv: voc/*.pg
+	cat $^ | pgraph | jq -r 'select(.type=="edge" and any(.labels[]; .=="replacedBy" or .=="superClass" or .==".superProperty"))|[.from,.to]|@tsv' > $@
+	cat $^ | pgraph | jq -r 'select(.type=="node" and .properties.alias)|[.properties.alias[0],.id]|@tsv' >> $@
 
 
diff --git a/crm-expand.tsv b/crm-expand.tsv
index ec3da3a..a8043eb 100644
--- a/crm-expand.tsv
+++ b/crm-expand.tsv
@@ -107,6 +107,102 @@ E75_Conceptual_Object_Appellation	E41_Appellation
 E82_Actor_Appellation	E41_Appellation
 E84_Information_Carrier	E22_Human_Made_Object
 E91_Co_Reference_Assignment	E13_Attribute_Assignment
+n4o_Accession	E10_Transfer_of_Custody
+n4o_AcquisitionType_Assignment	E17_Type_Assignment
+n4o_Acquisition_Type	E55_Type
+n4o_Activity_Type	E55_Type
+n4o_Actor_Assignment	E13_Attribute_Assignment
+n4o_Alternative_Title	E35_Title
+n4o_Appellation_Assignment	E13_Attribute_Assignment
+n4o_Appropriation	E10_Transfer_of_Custody
+n4o_Appropriation_Type	E55_Type
+n4o_Audiofile	E73_Information_Object
+n4o_Authorityfile	E32_Authority_Document
+n4o_Authorityfile_ID	E42_Identifier
+n4o_Collectionsystematics	E55_Type
+n4o_Collectionsystematics_Assignment	E17_Type_Assignment
+n4o_Comment	E31_Document
+n4o_Commissioning	E7_Activity
+n4o_Corporate_Body	E74_Group
+n4o_Deaccession	E10_Transfer_of_Custody
+n4o_Description	E31_Document
+n4o_Dimension_Type	E55_Type
+n4o_Encounter_Event	E7_Activity
+n4o_Environment	E27_Site
+n4o_Environmental_Affiliation	E5_Event
+n4o_Excavation	E7_Activity
+n4o_Exhibition	E87_Curation_Activity
+n4o_Exhibition_Type	E55_Type
+n4o_Existence	E5_Event
+n4o_Expedition	E7_Activity
+n4o_Field_Work	E7_Activity
+n4o_File	E73_Information_Object
+n4o_Finding	E73_Information_Object
+n4o_Foundation	E63_Beginning_of_Existence
+n4o_Geo_Coordinates	E42_Identifier
+n4o_Geographical_Place	E53_Place
+n4o_Global_Stratigraphic_Period	E4_Period
+n4o_Iconographic_Motive	E36_Visual_Item
+n4o_Iconography_Assignment	E13_Attribute_Assignment
+n4o_Identifier	E42_Identifier
+n4o_Image	E36_Visual_Item
+n4o_Inventory_Number	E42_Identifier
+n4o_Keyword	E55_Type
+n4o_Licence	E30_Right
+n4o_Licence_Type	E55_Type
+n4o_Literature	E31_Document
+n4o_Literature_Section	E31_Document
+n4o_Literature_Section_ID	E42_Identifier
+n4o_Literature_Type	E55_Type
+n4o_Local_Stratigraphic_Period	E4_Period
+n4o_Location	E53_Place
+n4o_Location_Type	E55_Type
+n4o_Material_Assignment	E13_Attribute_Assignment
+n4o_Museum_or_Collection_Affiliation	E5_Event
+n4o_Object	E22_Human_Made_Object
+n4o_ObjectType_Assignment	E17_Type_Assignment
+n4o_Object_Condition_Type	E55_Type
+n4o_Object_Documentation	E7_Activity
+n4o_Object_Transport	E9_Move
+n4o_Object_Type	E55_Type
+n4o_Occupation	E55_Type
+n4o_Photography	E65_Creation
+n4o_Place_Assignment	E13_Attribute_Assignment
+n4o_Preparation	E11_Modification
+n4o_Presentation_Type	E55_Type
+n4o_Research_Activity	E7_Activity
+n4o_Research_Activity_Type	E55_Type
+n4o_Restoration	E11_Modification
+n4o_Rock_Genesis	E63_Beginning_of_Existence
+n4o_Society_of_Origin	E74_Group
+n4o_Source	E22_Human_Made_Object
+n4o_Source_Content	E73_Information_Object
+n4o_Source_Content_Section	E73_Information_Object
+n4o_Source_Content_Type	E55_Type
+n4o_Stratigraphic_Period_Assignment	E13_Attribute_Assignment
+n4o_Systematization	E87_Curation_Activity
+n4o_Time_Assignment	E13_Attribute_Assignment
+n4o_Transcription	E31_Document
+n4o_URL	E42_Identifier
+n4o_Usage	E7_Activity
+n4o_UsageType_Assignment	E17_Type_Assignment
+n4o_Usage_Type	E55_Type
+n4o_Videofile	E73_Information_Object
+n4o_3D_Model	E73_Information_Object
+nmo_CoinWear	nmo_Wear
+nmo_Countermark	nmo_SecondaryTreatment
+nmo_DepositionType	nmo_Context
+nmo_DieWear	nmo_Wear
+nmo_DiscoveryType	nmo_Context
+nmo_Find	nmo_Context
+nmo_Hoard	nmo_Find
+nmo_Mintmark	nmo_Controlmark
+nmo_PeculiarityOfProduction	nmo_Peculiarity
+nmo_ReferenceWork	dcterms_BibliographicResource
+nmo_SecondaryTreatment	nmo_Peculiarity
+nmo_TypeSeries	nmo_ReferenceWork
+nmo_WeightStandard	dcterms_Standard
+nmo_hasFindType	nmo_hasContext
 E11_Modification_Event	E11_Modification
 E12_Production_Event	E12_Production
 E16_Measurement_Event	E16_Measurement
diff --git a/neo4j.json b/neo4j.json
index 27bd96b..285005f 100644
--- a/neo4j.json
+++ b/neo4j.json
@@ -1,6 +1,6 @@
 {
   "uri": "neo4j://localhost",
-  "url": "http://localhost:7474/",
+  "url": "http://localhost:7474",
   "user": "",
   "password": ""
 }