Refactor, use DataStoreType in place of Database enum