Fix resolution of value in composites
Assure existence of database on calculated state
Validate strictly on base of computed value
Fix names in data set
Fix names in data set