Adding datastore features