Add datastore support