changing datastore to use metadata helper