CMS-3501 Simplify data value classes. Seperated Values from Properties.