Fix imports after change of HC models