Rework HSFClient