Removed DataValue dependency