added datastore support