Added msi-nm classes