Add specific data structure for composite value members
Remove type reference from values