Few improvements for companies importer