refactor to use autoImport