Use the new DataValues repo