Upgraded to work with CMS Made Simple 1.1