Refactor DataStoreContext