Separated the datastore

- separated the datastore, but still under maintenance