Added better data importer