Add Datastore assembly

Split store from model