SHDP-232 Add first cut of the Datastore support