Add HSX support