Fixed return types for SaveValuation