Functionality is made more dynamic.
Extra fixes to CMSBundle.