Change databasehandler methods, and make static