Moving Fortify code to use BaseImporter