Issue #16: Replaced DataValue with String