Wrapper YAML: 2.1 entities for DataControl interface (fixed).