Fix imports after HC model updates