Merge Ezequiel Changes for Importer and Mime resolver