Further work on Importer, also tweaked schema a bit