Improve definition of MSD