#1532 - Improve Data definitions CMS element, also controlled list element