More Changes to DatabaseHandler