Add support for idh2/idh3