Improved CMS install