Updated to the new representation as a ISubstance