HSoM related changes