ENHANCEMENT: better CMS fields