Make use of the new DataValues components

Change-Id: Ic89aaf9b4008dff62e16b5e62b1c2835b614a798