Expanded class hierarchy of DatabaseHandler