MSTParser upgrade