Add support for MSS correction