MSC refactor