Update DatabaseDataStore.java