Adding support for HIRO