Add meta info management to datastore and client