Modified HVClientHelper