diff --git a/context/context.json b/context/context.json
index 1a51ad1..eb2152e 100644
--- a/context/context.json
+++ b/context/context.json
@@ -1657,7 +1657,7 @@
         "DipropylSulfone": "https://w3id.org/emmo/domain/chemicalsubstance#substance_f6eb3754_2ccb_406d_b407_c989a7e1b4f9",
         "DirectCoulometryAtControlledCurrent": "https://w3id.org/emmo/domain/chameo#DirectCoulometryAtControlledCurrent",
         "DirectCoulometryAtControlledPotential": "https://w3id.org/emmo/domain/chameo#DirectCoulometryAtControlledPotential",
-        "DirectCurrent": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_40ca9548_910a_48b6_9a26_f94095d349cd",
+        "DirectCurrent": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_885b462e_f6bc_412d_8b94_9425e13af0c7",
         "DirectionAndEnergyDistributionOfCrossSection": "https://w3id.org/emmo#EMMO_0e0ee94d_70be_4b7e_afcc_320e62a94974",
         "DirectionDistributionOfCrossSection": "https://w3id.org/emmo#EMMO_748ff828_763b_4290_adb9_e05376d4136a",
         "Discharge": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_06d8e1ee_924a_4915_998d_33a69f41dadc",
@@ -1860,7 +1860,7 @@
         "ElectronicModel": "https://w3id.org/emmo#EMMO_6eca09be_17e9_445e_abc9_000aa61b7a11",
         "ElectronvoltPerMetre": "https://w3id.org/emmo#ElectronvoltPerMetre",
         "Electroosmosis": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_5641910f_6e69_4ce4_be84_4b1bf14b8916",
-        "Electroplating": "https://w3id.org/emmo#EMMO_30e3edb5_0977_4b9b_9aed_5a4d16c1c07c",
+        "Electroplating": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_a2b92d2e_4431_411e_8da5_a4c08bac2c0e",
         "ElementalMaterial": "https://w3id.org/emmo#EMMO_a086af15_a7c3_404c_b4ce_c8e4466f1b4b",
         "ElementalSubstance": "https://w3id.org/emmo#EMMO_436b11bd_1756_4821_9f14_c9ed6b67552e",
         "ElementaryBoson": "https://w3id.org/emmo#EMMO_cafd0f10_ce85_48b9_9a36_2b0af141ce21",
@@ -2225,7 +2225,7 @@
         "ISQBaseQuantity": "https://w3id.org/emmo#EMMO_1a4c1a97_88a7_4d8e_b2f9_2ca58e92dde4",
         "ISQDerivedQuantity": "https://w3id.org/emmo#EMMO_2946d40b_24a1_47fa_8176_e3f79bb45064",
         "ISQDimensionlessQuantity": "https://w3id.org/emmo#EMMO_a66427d1_9932_4363_9ec5_7d91f2bfda1e",
-        "IUPACName": "https://w3id.org/emmo#EMMO_f652e7d2_0b33_4d10_8d0f_2f70089982ba",
+        "IUPACName": "https://w3id.org/emmo#EMMO_16a3bd5c_75f0_42b3_b000_cb0d018f840e",
         "IUPACNomencalture": "https://w3id.org/emmo#EMMO_91a0635a_a89a_46de_8928_04a777d145c7",
         "Icon": "https://w3id.org/emmo#EMMO_d7788d1a_020d_4c78_85a1_13563fcec168",
         "Illuminance": "https://w3id.org/emmo#EMMO_b51fbd00_a857_4132_9711_0ef70e7bdd20",
@@ -2687,7 +2687,7 @@
         "MagnesiumTriflate": "https://w3id.org/emmo/domain/chemicalsubstance#substance_df24fad8_7ef0_4330_a3f2_c4d65d9a3be8",
         "MagnesiumTrifluoromethanesulfonyloxalatoborate": "https://w3id.org/emmo/domain/chemicalsubstance#substance_2b7473ba_9156_489a_880f_3a2f746cd104",
         "MagneticDipoleMoment": "https://w3id.org/emmo#EMMO_81e767f1_59b1_4d7a_bf69_17f322241831",
-        "MagneticDipoleMomentUnit": "https://w3id.org/emmo#EMMO_1c2226a9_22f0_40c8_8928_5a01d398f96e",
+        "MagneticDipoleMomentUnit": "https://w3id.org/emmo#EMMO_5073dc80_aec2_4a3b_8057_fababfcbfe11",
         "MagneticFieldStrength": "https://w3id.org/emmo#EMMO_b4895f75_41c8_4fd9_b6d6_4d5f7c99c423",
         "MagneticFieldStrengthUnit": "https://w3id.org/emmo#EMMO_e6b83139_ba92_4fbd_a8b2_c8dde55844a1",
         "MagneticFlux": "https://w3id.org/emmo#EMMO_3b931698_937e_49be_ab1b_36fa52d91181",
@@ -2756,7 +2756,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#EMMO_7c055d65_2929_40e1_af4f_4bf10995ad50",
+        "MassFraction": "https://w3id.org/emmo/disciplines/units/coherentsiunits#EMMO_089f13b1_ceb3_4d2a_8795_b4a2d92916da",
         "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",
@@ -3392,7 +3392,7 @@
         "Porosity": "https://w3id.org/emmo#EMMO_3a6578ac_aee0_43b9_9bc6_1eb208c8c9a9",
         "PorousElectrode": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_3663991d_9319_4f7a_922b_f0e428b58801",
         "PorousSeparator": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_58413d4e_2885_459e_ac06_8d45e661cf91",
-        "PositionVector": "https://w3id.org/emmo#EMMO_4312cae4_03ba_457e_b35d_0671a7db350c",
+        "PositionVector": "https://w3id.org/emmo#EMMO_44da6d75_54a4_4aa8_bd3a_156f6e9abb8e",
         "PositiveElectrode": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_aff732a9_238a_4734_977c_b2ba202af126",
         "PositiveTerminal": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_522f0c0b_cf33_4328_af71_12e38dae6798",
         "Positron": "https://w3id.org/emmo#EMMO_26a38b26_38ea_4acf_b212_db9e34c71b7a",
@@ -3433,7 +3433,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/chameo#PotentiometricStrippingAnalysis",
+        "PotentiometricStrippingAnalysis": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_916b1863_f417_4b94_9407_9d749ada9ed5",
         "Potentiometry": "https://w3id.org/emmo/domain/chameo#Potentiometry",
         "Potentiostat": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_a9fc3f77_e48e_4bce_b118_044d608722f6",
         "PotentiostaticProcess": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_f07be701_9d6a_415b_ac6d_63202297a7a1",
@@ -3507,7 +3507,7 @@
         "Pyridine": "https://w3id.org/emmo/domain/chemicalsubstance#substance_f1e874cf_3e5e_46e3_9bb9_0befc3f7361a",
         "PyruvicAcid": "https://w3id.org/emmo/domain/chemicalsubstance#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",
@@ -3582,7 +3582,7 @@
         "R54215": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_fc9e7ba3_5084_4c2a_b488_c6a96af99232",
         "R616": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_dc019f3f_e5f3_4eeb_bab9_a845a02223a0",
         "R621": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_15ec346a_6d3c_4161_95e1_9cf889965f85",
-        "R626": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_6b275583_433f_46f7_aafd_ebc9409257cc",
+        "R626": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_68c1c36e_1548_4247_bae2_fe7102a2c4ff",
         "R712": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_bb2faf17_b819_4876_b17f_fa82917cf85d",
         "R716": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_34cb7ea7_2436_46e0_806e_a3c7835ae228",
         "R721": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_3279f575_1c62_4bf2_a6e8_de4c7ff36f8e",
@@ -3688,7 +3688,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_838a927f_775e_4c6d_8e39_7865548608c2",
+        "Record": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_59c041fc_eaa1_40fc_9b3e_1a6aca6119fd",
         "RectangularElectrode": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_14377ecb_5ead_431e_831e_159d622bd0ea",
         "RedAntiQuark": "https://w3id.org/emmo#EMMO_74fd4dfc_a59e_4f66_8822_7fc3ad8a0664",
         "RedBottomAntiQuark": "https://w3id.org/emmo#EMMO_1f8f92a8_4cc9_4fa3_9b5f_d5af5bab4fd2",
@@ -4290,7 +4290,7 @@
         "TetraethylOrthosilicate": "https://w3id.org/emmo/domain/chemicalsubstance#substance_385410f6_0c03_4942_b35f_52a664b5622c",
         "Tetrafluoroborate": "https://w3id.org/emmo/domain/chemicalsubstance#substance_2c939a73_6363_435a_bbc4_4f6ae02f30d1",
         "Tetraglyme": "https://w3id.org/emmo/domain/chemicalsubstance#substance_75322d4d_cdab_44c6_a8ea_5eca76bcfbd1",
-        "Tetrahydrofuran": "https://w3id.org/emmo/domain/chemicalsubstance#substance_a6d037e0_233e_4fb2_ba36_2f5b9263a450",
+        "Tetrahydrofuran": "https://w3id.org/emmo/domain/chemicalsubstance#substance_16864b33_aa8e_451d_ad8e_b0af5f18769a",
         "TetrapotassiumHeptaiodobismuthate": "https://w3id.org/emmo/domain/chemicalsubstance#substance_dbbedf09_18c4_416a_99c2_f381a74d2551",
         "Thallium": "https://w3id.org/emmo/domain/chemicalsubstance#substance_6970bc02_dfe3_40c7_b20d_03c6cc0707bb",
         "ThalliumAtom": "https://w3id.org/emmo#EMMO_bcf70555_8df3_5a39_b26a_a5e802d17a37",
@@ -4548,7 +4548,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/chemicalsubstance#substance_29fd347b_6a15_4c98_a982_84cf555b0b86",
         "WeakBaseCompound": "https://w3id.org/emmo/domain/chemicalsubstance#substance_8e5448fc_1916_4afb_9fd9_2489797f6922",
         "WeakBoson": "https://w3id.org/emmo#EMMO_1dcc2b31_7ff4_49ed_a1bc_6e4c055c951c",