Add some additional modifications to the DB and ExportUtil classes