diff --git a/context/context.json b/context/context.json
index d89849d..6ed5c14 100644
--- a/context/context.json
+++ b/context/context.json
@@ -355,6 +355,14 @@
             "@id": "https://w3id.org/emmo#EMMO_60577dea_9019_4537_ac41_80b0fb563d41",
             "@type": "@id"
         },
+        "hasSolute": {
+            "@id": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_8784ef24_320b_4a3d_b200_654aec6c271c",
+            "@type": "@id"
+        },
+        "hasSolvent": {
+            "@id": "https://w3id.org/emmo/domain/electrochemistry#electrochemistry_808e94df_e002_4e64_a6db_182ed75078c6",
+            "@type": "@id"
+        },
         "hasSpatialPart": {
             "@id": "https://w3id.org/emmo#EMMO_dc57d998_23db_4d8e_b2cd_f346b195b846",
             "@type": "@id"
@@ -769,13 +777,13 @@
         "BerylliumSymbol": "https://w3id.org/emmo#EMMO_b42b9f49_aa2a_5dc7_afa5_9c5c013b621d",
         "BetaDisintegrationEnergy": "https://w3id.org/emmo#EMMO_34bdb169_90da_4d38_a351_647071804e5d",
         "BindingFraction": "https://w3id.org/emmo#EMMO_29edd972_2e77_4658_8106_01c86b3b10a2",
-        "Bis(fluorosulfonyl)amide": "https://w3id.org/emmo/domain/chemical-substance#substance_df72af75_cc1c_4286_aeb8_66de90ef276d",
-        "Bis(malonato)borate": "https://w3id.org/emmo/domain/chemical-substance#substance_8ab6b726_e711_41d7_b237_b21094383239",
-        "Bis(oxalato)borate": "https://w3id.org/emmo/domain/chemical-substance#substance_7e9bbc33_c681_467a_b0d7_5de0e71230b4",
+        "BisFluorosulfonylAmide": "https://w3id.org/emmo/domain/chemical-substance#substance_df72af75_cc1c_4286_aeb8_66de90ef276d",
+        "BisMalonatoBorate": "https://w3id.org/emmo/domain/chemical-substance#substance_8ab6b726_e711_41d7_b237_b21094383239",
+        "BisOxalatoBorate": "https://w3id.org/emmo/domain/chemical-substance#substance_7e9bbc33_c681_467a_b0d7_5de0e71230b4",
+        "BisTriflimide": "https://w3id.org/emmo/domain/chemical-substance#substance_88d380f4_1207_4a30_a117_8472bb3d1d81",
         "Bismuth": "https://w3id.org/emmo/domain/chemical-substance#substance_334b7617_34d5_4cb4_9e03_cde9ff19183d",
         "BismuthAtom": "https://w3id.org/emmo#EMMO_0e08326e_376b_5d54_ad2c_2a7cf274af61",
         "BismuthSymbol": "https://w3id.org/emmo#EMMO_ed5acb06_0af0_5a3a_9b31_a1b32267f753",
-        "Bistriflimide": "https://w3id.org/emmo/domain/chemical-substance#substance_88d380f4_1207_4a30_a117_8472bb3d1d81",
         "BlowMolding": "https://w3id.org/emmo#EMMO_381b6a6e_6e8e_461a_8591_d7a60e823d4d",
         "BlueAntiQuark": "https://w3id.org/emmo#EMMO_c88a0f70_482b_4e37_9ae2_ee66bbfc20a7",
         "BlueBottomAntiQuark": "https://w3id.org/emmo#EMMO_29d24a97_f3bd_4e9b_934d_9da589f719e5",
@@ -1177,7 +1185,7 @@
         "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",
-        "Dimethylformamide": "https://w3id.org/emmo/domain/chemical-substance#substance_769bdc09_f533_4fde_bb53_20339d5bfcb7",
+        "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",
         "Dioxolane": "https://w3id.org/emmo/domain/chemical-substance#substance_0e235e95_739d_443a_ad4b_97ef1edb9c89",
@@ -1549,8 +1557,8 @@
         "HertzPerTesla": "https://w3id.org/emmo#HertzPerTesla",
         "HertzPerVolt": "https://w3id.org/emmo#HertzPerVolt",
         "Heteronuclear": "https://w3id.org/emmo#EMMO_50967f46_51f9_462a_b1e4_e63365b4a184",
-        "Hexafluoroarsenate": "https://w3id.org/emmo/domain/chemical-substance#substance_bafc6512_126d_4d9a_9c08_2b210317e77f",
-        "Hexafluorophosphate": "https://w3id.org/emmo/domain/chemical-substance#substance_dd746094_1893_4b77_9c07_13b3bd94a742",
+        "HexaFluoroArsenate": "https://w3id.org/emmo/domain/chemical-substance#substance_bafc6512_126d_4d9a_9c08_2b210317e77f",
+        "HexaFluoroPhosphate": "https://w3id.org/emmo/domain/chemical-substance#substance_dd746094_1893_4b77_9c07_13b3bd94a742",
         "Hexamethylphosphoramide": "https://w3id.org/emmo/domain/chemical-substance#substance_3210b87b_988f_49f5_99a8_0a20cd42db57",
         "HexanoicAcid": "https://w3id.org/emmo/domain/chemical-substance#substance_9d130518_2b84_435f_8632_039d43d2ef5d",
         "HiggsBoson": "https://w3id.org/emmo#EMMO_676a29e6_d4e1_4b54_8961_25947bd20861",
@@ -1571,7 +1579,7 @@
         "HydrogenFluoride": "https://w3id.org/emmo/domain/chemical-substance#substance_f7a11bfc_4cb1_45a7_8248_8e2d534884d3",
         "HydrogenIodide": "https://w3id.org/emmo/domain/chemical-substance#substance_835df324_98ae_44c2_a0ff_bd9142240b8c",
         "HydrogenSymbol": "https://w3id.org/emmo#EMMO_93582808_e5fc_5bb5_bc7a_0e674e1a7f0e",
-        "Hydroxylamine ": "https://w3id.org/emmo/domain/chemical-substance#substance_5b24c742_1149_4533_8d48_41473396d06d",
+        "Hydroxylamine": "https://w3id.org/emmo/domain/chemical-substance#substance_5b24c742_1149_4533_8d48_41473396d06d",
         "HyperfineStructureQuantumNumber": "https://w3id.org/emmo#EMMO_1942247a_50b4_4109_bff4_bb213de45e08",
         "HyperfineTransitionFrequencyOfCs": "https://w3id.org/emmo#EMMO_f96feb3f_4438_4e43_aa44_7458c4d87fc2",
         "Hyperon": "https://w3id.org/emmo#EMMO_f87e79eb_f549_4a06_9c27_a3d1412444c6",
@@ -1923,7 +1931,7 @@
         "MagnesiumTriflate": "https://w3id.org/emmo/domain/chemical-substance#substance_df24fad8_7ef0_4330_a3f2_c4d65d9a3be8",
         "MagnesiumTrifluoromethanesulfonyloxalatoborate": "https://w3id.org/emmo/domain/chemical-substance#substance_2b7473ba_9156_489a_880f_3a2f746cd104",
         "MagneticDipoleMoment": "https://w3id.org/emmo#EMMO_81e767f1_59b1_4d7a_bf69_17f322241831",
-        "MagneticDipoleMomentUnit": "https://w3id.org/emmo#EMMO_5073dc80_aec2_4a3b_8057_fababfcbfe11",
+        "MagneticDipoleMomentUnit": "https://w3id.org/emmo#EMMO_1c2226a9_22f0_40c8_8928_5a01d398f96e",
         "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",
@@ -1986,7 +1994,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",
@@ -2409,6 +2417,7 @@
         "Permittivity": "https://w3id.org/emmo#EMMO_0ee5779e_d798_4ee5_9bfe_c392d5bea112",
         "PermittivityUnit": "https://w3id.org/emmo#EMMO_5f89cb0c_3171_47ee_b2ab_027a07c34c4b",
         "Persistence": "https://w3id.org/emmo#EMMO_e04884d9_eda6_487e_93d5_7722d7eda96b",
+        "Person": "https://schema.org/Person",
         "Perspective": "https://w3id.org/emmo#EMMO_49267eba_5548_4163_8f36_518d65b583f9",
         "Peta": "https://w3id.org/emmo#EMMO_d7c74480_a568_4470_acff_f18b499cc850",
         "PetaPrefixedUnit": "https://w3id.org/emmo#EMMO_43a6b269_da31_4bb6_a537_c97df4fff32a",
@@ -2481,7 +2490,7 @@
         "PolyvinylideneFluoride": "https://w3id.org/emmo/domain/chemical-substance#substance_f2e48e9e_f774_4f42_939f_1fe522efb7c8",
         "PorcelainOrCeramicCasting": "https://w3id.org/emmo#EMMO_d320f878_2be4_4927_aea6_d36a2ae2dd89",
         "Porosity": "https://w3id.org/emmo#EMMO_3a6578ac_aee0_43b9_9bc6_1eb208c8c9a9",
-        "PositionVector": "https://w3id.org/emmo#EMMO_44da6d75_54a4_4aa8_bd3a_156f6e9abb8e",
+        "PositionVector": "https://w3id.org/emmo#EMMO_4312cae4_03ba_457e_b35d_0671a7db350c",
         "Positron": "https://w3id.org/emmo#EMMO_26a38b26_38ea_4acf_b212_db9e34c71b7a",
         "PostTransitionMetalElementalSubstance": "https://w3id.org/emmo/domain/chemical-substance#substance_b978912b_19ef_4d46_8c91_2e3578b12670",
         "PostTransitionMetalOxideCompound": "https://w3id.org/emmo/domain/chemical-substance#substance_61c88366_7689_4814_b0c5_1f53aef1eebd",
@@ -2883,7 +2892,9 @@
         "SolidSolution": "https://w3id.org/emmo#EMMO_5e77f00d_5c0a_44e7_baf1_2c2a4cb5b3ae",
         "Solubility": "https://w3id.org/emmo#EMMO_38d65ffa_353f_4820_8781_ff986b63e517",
         "SolubilityProduct": "https://w3id.org/emmo#EMMO_40989212_4866_41c0_8a20_84fd39540f29",
+        "Solute": "https://w3id.org/emmo/domain/chemical-substance#substance_3899a9c9_9b34_443e_8ce6_0257589bb38a",
         "Solution": "https://w3id.org/emmo#EMMO_2031516a_2be7_48e8_9af7_7e1270e308fe",
+        "Solvent": "https://w3id.org/emmo/domain/chemical-substance#substance_0f2f65a7_5cc4_4c86_a4d0_676771c646f1",
         "SolventCompound": "https://w3id.org/emmo/domain/chemical-substance#substance_81b90332_8b8e_407b_a8fd_517306d56a59",
         "Somatosensory": "https://w3id.org/emmo#EMMO_8f207971_aaab_48dc_a10d_55a6b4331410",
         "SourceCode": "https://w3id.org/emmo#EMMO_348d39f7_6a17_49d1_9860_9b33b69b51de",
@@ -2976,7 +2987,7 @@
         "Stage": "https://w3id.org/emmo#EMMO_a633c6f8_4269_4870_9b28_f5ca1783fd54",
         "StandaloneAtom": "https://w3id.org/emmo#EMMO_2fd3f574_5e93_47fe_afca_ed80b0a21ab4",
         "StandaloneModelSimulation": "https://w3id.org/emmo#EMMO_d0bcf2ca_cd55_4f34_8fc2_2decc4c6087a",
-        "StandardAbsoluteActivity": "https://w3id.org/emmo#EMMO_d368744e_bb2e_4d40_a7ef_762505b6027e",
+        "StandardAbsoluteActivity": "https://w3id.org/emmo#EMMO_340ec9c3_7b0a_4169_a739_6f9242517ff4",
         "StandardAbsoluteActivityOfSolvent": "https://w3id.org/emmo#EMMO_bf66642d_f13d_42d2_ad6d_eafd41686155",
         "StandardAmountConcentration": "https://w3id.org/emmo#EMMO_46b8d239_5d79_4d3e_bf8e_228d52fc3428",
         "StandardChemicalPotential": "https://w3id.org/emmo#EMMO_be31e6c6_881f_41c4_8354_c05aac4d7c46",
@@ -3106,8 +3117,8 @@
         "TerbiumSymbol": "https://w3id.org/emmo#EMMO_6599389d_7a26_5d51_a65c_5dd9c3ed532f",
         "Tesla": "https://w3id.org/emmo#Tesla",
         "Tessellation": "https://w3id.org/emmo#EMMO_ee0466e4_780d_4236_8281_ace7ad3fc5d2",
+        "TetraFluoroBorate": "https://w3id.org/emmo/domain/chemical-substance#substance_2c939a73_6363_435a_bbc4_4f6ae02f30d1",
         "TetraethylOrthosilicate": "https://w3id.org/emmo/domain/chemical-substance#substance_385410f6_0c03_4942_b35f_52a664b5622c",
-        "Tetrafluoroborate": "https://w3id.org/emmo/domain/chemical-substance#substance_2c939a73_6363_435a_bbc4_4f6ae02f30d1",
         "Tetraglyme": "https://w3id.org/emmo/domain/chemical-substance#substance_75322d4d_cdab_44c6_a8ea_5eca76bcfbd1",
         "Tetrahydrofuran": "https://w3id.org/emmo/domain/chemical-substance#substance_16864b33_aa8e_451d_ad8e_b0af5f18769a",
         "TetrapotassiumHeptaiodobismuthate": "https://w3id.org/emmo/domain/chemical-substance#substance_dbbedf09_18c4_416a_99c2_f381a74d2551",
@@ -3202,8 +3213,8 @@
         "TransitionMetalOxideCompound": "https://w3id.org/emmo/domain/chemical-substance#substance_b474f792_011e_4c9a_8dee_b99d6459cd66",
         "TransitionMetalSaltCompound": "https://w3id.org/emmo/domain/chemical-substance#substance_015116fe_94ca_4be5_9d14_9d9457a47a72",
         "TransportationDevice": "https://w3id.org/emmo#EMMO_95d4eb9b_d3d0_4705_a01c_4f87fb5f8d43",
+        "TriFluoroMethaneSulfonate": "https://w3id.org/emmo/domain/chemical-substance#substance_60441902_f7f6_4747_99c7_e15eb8c73706",
         "Trichlorofluoromethane": "https://w3id.org/emmo/domain/chemical-substance#substance_9e25f281_5f69_4300_82a7_9025ea2061c4",
-        "Trifluoromethanesulfonate": "https://w3id.org/emmo/domain/chemical-substance#substance_60441902_f7f6_4747_99c7_e15eb8c73706",
         "Triglyme": "https://w3id.org/emmo/domain/chemical-substance#substance_f57d5d5e_15a4_40de_a8d1_c3504f3c8827",
         "TrimethoxyMethylSilane": "https://w3id.org/emmo/domain/chemical-substance#substance_eccb603e_76be_435e_902f_7ebd9f26690b",
         "Tris222TrifluoroethylBorate": "https://w3id.org/emmo/domain/chemical-substance#substance_1c24293c_3a09_4084_a6bb_0db9fae5e786",