add support for datastore