DatabaseHandler.java modified