Add general resolver to importer

Good point. I'll give that a try and see how it looks.