More datastore hooks.

Change-Id: Ia3324d4d95b6776969e9e76e9d7476e5b23c03c1