Initial changes to import multiple files at once