Changes to DatabaseHandlder.