adding msim support