Updated for CMS MS 1.0.x