Enhancing security on datastore.