Add IMC support