add datastore support