adapted to msi API changes