Rework HSFClient to HSFCatcher and composite aggregation HSFClient