CMS-3501 Simplify data value classes. Simplifying Property class.