Removed Tracker, improved Importer