fix the datastore models

Change-Id: I1b7cfcb3e5582ca21e61e4b0d3abecd9ea1fa657