More DataValue improvements.