Updated Importer Framework (to be tested!)