Added more fields to CMS