fixed references to the CMS facade