Begin to incorportate Datastore entity with Galaxy