Improved MS support