Updated Database.java