Some updates to support the soon-to-be integrated hic bundle