Refine MSB support