Bunch of HSoM changes