Update hbx_id definition and behavior