DatabaseHandler added
After merge