fixed importer to work with scopes etc.