Updates for version 2 with CMS