Final changes for msm 3.0.0a