Add better language support for importers