CMS-3501 Simplify data value classes. Simplified the value class.