CMS now refactored to use world dictionary