Trying to fx missing value type
Restructuring