Improve HS_ClientManager and fix issue