diff --git a/context/context.json b/context/context.json
index f3a710d..8e59221 100644
--- a/context/context.json
+++ b/context/context.json
@@ -1698,7 +1698,7 @@
         "DensityOfHeatFlowRate": "https://w3id.org/emmo#EMMO_ee7ddcb8_ad8e_4ff7_a09f_889d8edf8f8b",
         "DensityOfVibrationalStates": "https://w3id.org/emmo#EMMO_88bbdd04_908f_45f0_9ded_d73b430de3b1",
         "DensityUnit": "https://w3id.org/emmo#EMMO_1c957677_a460_4702_85a6_baef659d14b1",
-        "DepthOfDischarge": "https://w3id.org/emmo/domain/battery#battery_22353114_9b0a_42d1_b96c_3a702c273e2d",
+        "DepthOfDischarge": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_1acab8af_9798_45df_a64b_a7030c57a4de",
         "DerivedQuantity": "https://w3id.org/emmo#EMMO_71f6ab56_342c_484b_bbe0_de86b7367cb3",
         "DerivedUnit": "https://w3id.org/emmo#EMMO_08b308d4_31cd_4779_a784_aa92fc730f39",
         "Description": "https://w3id.org/emmo#EMMO_35d4c439_fcb6_4399_a855_a89a207b41e9",
@@ -1714,7 +1714,7 @@
         "DeviceVolume": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_b4184e46_c53c_47cc_9bfc_186fd77836a5",
         "DewPointTemperature": "https://w3id.org/emmo#EMMO_a383e332_a271_463f_9e44_559604547220",
         "Diameter": "https://w3id.org/emmo#EMMO_c1c8ac3c_8a1c_4777_8e0b_14c1f9f9b0c6",
-        "Dichloromethane": "https://w3id.org/emmo/domain/chemical-substance#substance_a6feec60_5fe7_4687_b427_3bf2ed06008d",
+        "Dichloromethane": "https://w3id.org/emmo/domain/chemical-substance#substance_8385c3c4_5906_48f6_b6b6_4bb60dccc27a",
         "DieCasting": "https://w3id.org/emmo#EMMO_a85d0b8a_588e_423f_b799_97b0890e9183",
         "DielectricAndImpedanceSpectroscopy": "https://w3id.org/emmo/domain/characterisation-methodology/chameo#DielectricAndImpedanceSpectroscopy",
         "Dielectrometry": "https://w3id.org/emmo/domain/characterisation-methodology/chameo#Dielectrometry",
@@ -1749,7 +1749,7 @@
         "Dimethoxyethane": "https://w3id.org/emmo/domain/chemical-substance#substance_b6ecabf9_14a4_4808_a139_55329e70ad42",
         "Dimethoxymethane": "https://w3id.org/emmo/domain/chemical-substance#substance_21954b0b_c05c_42db_b276_3a931d8aabb1",
         "DimethylCarbonate": "https://w3id.org/emmo/domain/chemical-substance#substance_c4a7d7bd_497e_457e_b858_ff73254266d0",
-        "DimethylSulfoxide": "https://w3id.org/emmo/domain/chemical-substance#substance_ea68e1a4_6be8_4686_8701_ba88b40d00b7",
+        "DimethylSulfoxide": "https://w3id.org/emmo/domain/chemical-substance#substance_b593b5dd_7957_4b85_856a_dd59775210b6",
         "Dimethylformamide": "https://w3id.org/emmo/domain/chemical-substance#substance_817d1989_4d6d_4c32_9951_85973afc538d",
         "Dimethylpropyleneurea": "https://w3id.org/emmo/domain/chemical-substance#substance_945c68da_3baf_4da6_b794_dca7aebc4ca7",
         "Dimethylsulfate": "https://w3id.org/emmo/domain/chemical-substance#substance_3c8fb431_7d9d_4a89_a494_708df34f44d3",
@@ -2892,7 +2892,7 @@
         "MassExcess": "https://w3id.org/emmo#EMMO_7dd84949_0afa_4313_9b89_7bb0dd2e7771",
         "MassFlow": "https://w3id.org/emmo#EMMO_6d61ee3c_c5b6_4452_bc11_e9c33af992a7",
         "MassFluxUnit": "https://w3id.org/emmo#EMMO_e35d4936_b2e3_4cd6_a437_f1c864b3d450",
-        "MassFraction": "https://w3id.org/emmo/disciplines/units/coherentsiunits#EMMO_089f13b1_ceb3_4d2a_8795_b4a2d92916da",
+        "MassFraction": "https://w3id.org/emmo#EMMO_7c055d65_2929_40e1_af4f_4bf10995ad50",
         "MassFractionOfDryMatter": "https://w3id.org/emmo#EMMO_8f171308_f902_42c5_ac1d_d5259022e9c1",
         "MassFractionOfWater": "https://w3id.org/emmo#EMMO_cac16ce6_2cef_405d_ac63_0f918db4875e",
         "MassFractionUnit": "https://w3id.org/emmo#EMMO_18448443_dcf1_49b8_a321_cf46e2c393e1",
@@ -3254,7 +3254,7 @@
         "NickelOxideHydroxideElectrode": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_344ed3a6_481a_499f_afef_631f1cece9ef",
         "NickelSaltCompound": "https://w3id.org/emmo/domain/chemical-substance#substance_dce90b66_3414_4f5d_b818_4a0e4339e949",
         "NickelSymbol": "https://w3id.org/emmo#EMMO_1fade54b_20ed_5e58_af59_214ea3b15ba9",
-        "NickelZincBattery": "https://w3id.org/emmo/domain/battery#battery_46b8433d_fd57_4819_b34f_1636b72ad12e",
+        "NickelZincBattery": "https://w3id.org/emmo/domain/battery#battery_0c3674b5_3f7b_4308_9bed_0ade6eb69a4e",
         "NihoniumAtom": "https://w3id.org/emmo#EMMO_75771a96_5e17_568c_bc28_caba06c0047a",
         "NihoniumSymbol": "https://w3id.org/emmo#EMMO_8fbc9110_c822_5b8e_a5fc_ee5430d9f34a",
         "Niobium": "https://w3id.org/emmo/domain/chemical-substance#substance_5ce53b37_1248_43b0_8862_ef4bff996dcf",
@@ -3618,7 +3618,7 @@
         "PotentialScanRate": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_264f40d1_17c9_4bc7_9c47_5cfb18132278",
         "PotentialTimePlot": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_cd7d24a5_db31_4d76_97d9_367c809f099e",
         "PotentiometricSelectivityCoefficient": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_136744ff_0563_4df7_aa03_4219d70392a0",
-        "PotentiometricStrippingAnalysis": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_916b1863_f417_4b94_9407_9d749ada9ed5",
+        "PotentiometricStrippingAnalysis": "https://w3id.org/emmo/domain/characterisation-methodology/chameo#PotentiometricStrippingAnalysis",
         "Potentiometry": "https://w3id.org/emmo/domain/characterisation-methodology/chameo#Potentiometry",
         "Potentiostat": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_a9fc3f77_e48e_4bce_b118_044d608722f6",
         "PotentiostaticCycling": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_5a5ef74b_e4a7_4b85_ab21_ae0febebaf58",
@@ -3654,7 +3654,7 @@
         "PrimaryBattery": "https://w3id.org/emmo/domain/battery#battery_3b0b0d6e_8b0e_4491_885e_8421d3eb3b69",
         "PrimaryData": "https://w3id.org/emmo/domain/characterisation-methodology/chameo#PrimaryData",
         "PrincipalQuantumNumber": "https://w3id.org/emmo#EMMO_385de036_637c_48fa_b6d5_5dca6f79d350",
-        "Prismatic": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_83fbc038_0c2e_4d04_91d7_cdf30f8a5535",
+        "Prismatic": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_6775b232_c58a_4303_8164_137261329db6",
         "PrismaticBattery": "https://w3id.org/emmo/domain/battery#battery_86c9ca80-de6f-417f-afdc-a7e52fa6322d",
         "PrismaticCase": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_43cd6e14_dd43_41b5_b5b4_344d53841603",
         "Probability": "https://w3id.org/emmo#EMMO_0a88be81_343d_4388_92c1_09228ff95ada",
@@ -3703,7 +3703,7 @@
         "Pyridine": "https://w3id.org/emmo/domain/chemical-substance#substance_f1e874cf_3e5e_46e3_9bb9_0befc3f7361a",
         "PyruvicAcid": "https://w3id.org/emmo/domain/chemical-substance#substance_feb95008_db3a_4506_b7ff_6263befa0d64",
         "Python": "https://w3id.org/emmo#EMMO_add2e29d_6d87_4b78_9706_588e25557093",
-        "QualityFactor": "https://w3id.org/emmo#EMMO_0658e7df_ffd9_4779_82fc_62efe0a7f3b1",
+        "QualityFactor": "https://w3id.org/emmo#EMMO_cff5ef70_96eb_4ea3_9bea_fe1fbe6177be",
         "Quantity": "https://w3id.org/emmo#EMMO_0650c031_42b6_4f0a_b62d_d88f071da6bf",
         "QuantityValue": "https://w3id.org/emmo#EMMO_f658c301_ce93_46cf_9639_4eace2c5d1d5",
         "Quantum": "https://w3id.org/emmo#EMMO_3f9ae00e_810c_4518_aec2_7200e424cf68",
@@ -3887,7 +3887,7 @@
         "ReciprocalVolume": "https://w3id.org/emmo#EMMO_ca369738_78de_470b_8631_be83f75e45a3",
         "ReciprocalWeber": "https://w3id.org/emmo#ReciprocalWeber",
         "RecombinationCoefficient": "https://w3id.org/emmo#EMMO_65b794a4_cf52_4d0a_88c4_2c479537b30a",
-        "Record": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_59c041fc_eaa1_40fc_9b3e_1a6aca6119fd",
+        "Record": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_838a927f_775e_4c6d_8e39_7865548608c2",
         "RecoveredCapacity": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_73f169de_d189_4d7c_893f_a2549771825c",
         "RectangularElectrode": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_14377ecb_5ead_431e_831e_159d622bd0ea",
         "RedAntiQuark": "https://w3id.org/emmo#EMMO_74fd4dfc_a59e_4f66_8822_7fc3ad8a0664",
@@ -3937,7 +3937,7 @@
         "ResistanceToAlternativeCurrent": "https://w3id.org/emmo#EMMO_83a43803_0b0f_45a4_86a3_bc6b32e6a540",
         "ResonanceEnergy": "https://w3id.org/emmo#EMMO_038cb8cb_c035_40c1_a3e7_7f24d63b2804",
         "ResonanceEscapeProbability": "https://w3id.org/emmo#EMMO_0b0dc439_fe4b_4e59_a5f6_655b0bf48559",
-        "ResourceIdentifier": "https://w3id.org/emmo#EMMO_c404e6d9_261d_4d2e_ab0d_ba4e05062647",
+        "ResourceIdentifier": "http://purl.org/spar/datacite/ResourceIdentifier",
         "ResponseTimeAtAnISE": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_1a104474_c326_4a29_ac26_26a05ac8f72c",
         "RestEnergy": "https://w3id.org/emmo#EMMO_5117c5fe_f661_46f8_83c3_b48947f1532a",
         "RestMass": "https://w3id.org/emmo#EMMO_3c947caf_4070_4c79_a3a3_e53274ac9944",
@@ -4573,7 +4573,7 @@
         "TinSymbol": "https://w3id.org/emmo#EMMO_09e84f72_511a_5d22_adf1_accacaf7146a",
         "Titanium": "https://w3id.org/emmo/domain/chemical-substance#substance_f8d50782_11fa_4188_ba55_d043d2eb597d",
         "TitaniumAtom": "https://w3id.org/emmo#EMMO_0eee5986_12a1_5f73_b5e0_6eb2b640c924",
-        "TitaniumBasedElectrode": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_9c557caa_61e2_4fa9_a517_4bad01a68122",
+        "TitaniumBasedElectrode": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_d90221a0_0da7_4876_9cac_0e943e445f6f",
         "TitaniumDioxide": "https://w3id.org/emmo/domain/chemical-substance#substance_d673ceb2_3045_4e2e_8cad_56f5169b542f",
         "TitaniumDioxideElectrode": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_76fe8fb2_868e_48eb_95ca_fc6acd6f5fc9",
         "TitaniumIIIOxide": "https://w3id.org/emmo/domain/chemical-substance#substance_5ca70573_eeed_4fed_af97_32560b532ccd",
@@ -4768,7 +4768,7 @@
         "WaveSpring": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_6385e07f_f40d_46b2_b998_c439950d75cb",
         "WaveVector": "https://w3id.org/emmo#EMMO_6074aa9d_7c3b_4011_b45a_4e7cde6f5f39",
         "Wavelength": "https://w3id.org/emmo#EMMO_573c7572_e7c7_4909_93a4_2bfe102e389d",
-        "Wavenumber": "https://w3id.org/emmo#EMMO_e0aaed83_9224_4bd8_a960_a813c4569412",
+        "Wavenumber": "https://w3id.org/emmo#EMMO_d859588d_44dc_4614_bc75_5fcd0058acc8",
         "WeakAcid": "https://w3id.org/emmo/domain/chemical-substance#substance_29fd347b_6a15_4c98_a982_84cf555b0b86",
         "WeakBaseCompound": "https://w3id.org/emmo/domain/chemical-substance#substance_8e5448fc_1916_4afb_9fd9_2489797f6922",
         "WeakBoson": "https://w3id.org/emmo#EMMO_1dcc2b31_7ff4_49ed_a1bc_6e4c055c951c",