Refactor datastore

To fix the requirement of keeping single storage of several same data