Updated to work with CMS MS 1.0.x