address HC API changes, add more for v2 (hidden)