Added DateValue object back in