Updated Databasehandler