updated data importer and various DAOs