updated Datastore

updated datastore for better compatibility with back end.