Change MSA and MFD to not be property