Add hi2 support