Added support for HcCore