Better HIARCS support