Updated DatabaseHandler